|
@@ -9,6 +9,7 @@ import com.persagy.proxy.adm.request.AdmCreateRequest;
|
|
|
import com.persagy.proxy.adm.request.AdmQueryCriteria;
|
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
|
import com.persagy.proxy.adm.service.IAdmDictService;
|
|
|
+import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
import com.persagy.proxy.common.entity.InstanceUrlParam;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
@@ -35,9 +36,6 @@ import java.util.List;
|
|
|
@Slf4j
|
|
|
public class AdmDictController {
|
|
|
|
|
|
- @Value("${middleware.group.code}")
|
|
|
- private String groupCode;
|
|
|
-
|
|
|
@Autowired
|
|
|
private IAdmDictService service;
|
|
|
|
|
@@ -52,7 +50,7 @@ public class AdmDictController {
|
|
|
public AdmResponse queryCategory(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody AdmDict request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
if(StringUtils.isEmpty(request.getType())){
|
|
|
throw new Exception("type不能为空");
|
|
|
}
|
|
@@ -71,7 +69,7 @@ public class AdmDictController {
|
|
|
public AdmResponse dictBatch(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody AdmCreateRequest<AdmDictBatch> request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
//方案设定:方案id :全新设定(schemeZero)、方案1(schemeOne)、方案2(schemeTwo),
|
|
|
//"注意SchemeId为必填字段 ,优先级在列表中[R,S,M] ,一级标签[技术参数,基本参数] 列表为String类型
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
@@ -88,7 +86,7 @@ public class AdmDictController {
|
|
|
public AdmResponse query(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody AdmDictQueryCriteria request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
request.setName(request.getType());
|
|
|
return service.doQueryObjectInfo(context, request, AdmDictConstant.CLASS_CODE, AdmObjectInfo.class);
|
|
|
}
|
|
@@ -105,7 +103,7 @@ public class AdmDictController {
|
|
|
public AdmResponse familyQuery(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
|
|
@@ -120,7 +118,7 @@ public class AdmDictController {
|
|
|
public AdmResponse resetDic(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody AdmDictQueryCriteria request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
return service.resetDic(context,request,null,AdmObjectInfo.class);
|
|
|
}
|
|
|
|
|
@@ -136,7 +134,7 @@ public class AdmDictController {
|
|
|
public AdmResponse resetType(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody AdmDictQueryCriteria request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
if(StringUtils.isEmpty(request.getType())){
|
|
|
throw new Exception("type不能为空");
|
|
|
}
|
|
@@ -155,7 +153,7 @@ public class AdmDictController {
|
|
|
public AdmResponse settingDicProject(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody AdmCreateRequest<AdmObjectInfo> request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
return service.settingDicProject(context,request,AdmObjectInfo.class);
|
|
|
}
|
|
|
|
|
@@ -171,7 +169,7 @@ public class AdmDictController {
|
|
|
public AdmResponse querySystemEquipCategory(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody AdmDict request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
request.setType(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue());
|
|
|
return service.queryCategory(context,request,AdmObjectType.class);
|
|
|
}
|
|
@@ -188,7 +186,7 @@ public class AdmDictController {
|
|
|
public AdmResponse queryMorlDict(@QueryParam("projectId") String projectId,
|
|
|
@RequestBody List<String> dictTypeList) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
if(CollUtil.isEmpty(dictTypeList)){
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|