|
@@ -8,6 +8,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
|
|
import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
|
|
import com.persagy.dmp.delivery.entity.ObjectTypeCollect;
|
|
import com.persagy.dmp.delivery.entity.ObjectTypeCollect;
|
|
|
|
+import com.persagy.dmp.common.constant.CommonConstant;
|
|
|
|
+import com.persagy.dmp.common.model.entity.AuditableEntity;
|
|
|
|
+import com.persagy.dmp.define.entity.ObjectInfoCollect;
|
|
|
|
+import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
import com.persagy.proxy.adm.constant.AdmDictConstant;
|
|
import com.persagy.proxy.adm.constant.AdmDictConstant;
|
|
import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
|
|
import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
|
|
import com.persagy.proxy.adm.request.AdmCreateRequest;
|
|
import com.persagy.proxy.adm.request.AdmCreateRequest;
|
|
@@ -57,6 +61,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
if(AdmDictCategoryEnum.MAJOR.getValue().equals(type)){
|
|
if(AdmDictCategoryEnum.MAJOR.getValue().equals(type)){
|
|
//查询专业分类
|
|
//查询专业分类
|
|
node.put("type",AdmDictCategoryEnum.MAJOR.getValue());
|
|
node.put("type",AdmDictCategoryEnum.MAJOR.getValue());
|
|
|
|
+ node.put(AuditableEntity.PROP_VALID,1);
|
|
criteria.setCriteria(node);
|
|
criteria.setCriteria(node);
|
|
admResponse = doQueryDictData(context, criteria, clazz);
|
|
admResponse = doQueryDictData(context, criteria, clazz);
|
|
}
|
|
}
|
|
@@ -65,6 +70,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
if(baseCategory.contains(type)){
|
|
if(baseCategory.contains(type)){
|
|
//查询设备类型:equipment,部件类型:component,输入系统类型:system,输入专业类型:major,业务空间类型 space ,资产 property
|
|
//查询设备类型:equipment,部件类型:component,输入系统类型:system,输入专业类型:major,业务空间类型 space ,资产 property
|
|
node.put("objType",type);
|
|
node.put("objType",type);
|
|
|
|
+ node.put(AuditableEntity.PROP_VALID,1);
|
|
criteria.setCriteria(node);
|
|
criteria.setCriteria(node);
|
|
admResponse = doQueryObjectType(context, criteria, clazz);
|
|
admResponse = doQueryObjectType(context, criteria, clazz);
|
|
}
|
|
}
|
|
@@ -74,6 +80,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
ArrayNode arrayNode = node.putObject("objType").putArray("$in");
|
|
ArrayNode arrayNode = node.putObject("objType").putArray("$in");
|
|
arrayNode.add(AdmDictCategoryEnum.COMPONENT.getValue());
|
|
arrayNode.add(AdmDictCategoryEnum.COMPONENT.getValue());
|
|
arrayNode.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
|
|
arrayNode.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
|
|
|
|
+ node.put(AuditableEntity.PROP_VALID,1);
|
|
criteria.setCriteria(node);
|
|
criteria.setCriteria(node);
|
|
admResponse = doQueryObjectType(context, criteria, clazz);
|
|
admResponse = doQueryObjectType(context, criteria, clazz);
|
|
}
|
|
}
|
|
@@ -106,9 +113,12 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
private AdmResponse queryDictObjectTypeTree(InstanceUrlParam context ,String type, Class<T> clazz){
|
|
private AdmResponse queryDictObjectTypeTree(InstanceUrlParam context ,String type, Class<T> clazz){
|
|
//查询所有的专业
|
|
//查询所有的专业
|
|
List<AdmObjectType> allMajor = getAllMajor(context, clazz);
|
|
List<AdmObjectType> allMajor = getAllMajor(context, clazz);
|
|
-
|
|
|
|
|
|
+ QueryCriteria criteria = new QueryCriteria();
|
|
|
|
+ ObjectNode node = JsonNodeFactory.instance.objectNode();
|
|
|
|
+ node.put(AuditableEntity.PROP_VALID,1);
|
|
|
|
+ criteria.setCriteria(node);
|
|
//查询所有的类型
|
|
//查询所有的类型
|
|
- AdmResponse admResponse = doQueryObjectType(context, new QueryCriteria(), clazz);
|
|
|
|
|
|
+ AdmResponse admResponse = doQueryObjectType(context, criteria, clazz);
|
|
List<AdmObjectType> objectTypes = (List<AdmObjectType>) admResponse.getContent();
|
|
List<AdmObjectType> objectTypes = (List<AdmObjectType>) admResponse.getContent();
|
|
Map<String, List<AdmObjectType>> objectTypeMap = objectTypes.stream().filter(k-> StringUtils.isNotEmpty(k.getObjType()))
|
|
Map<String, List<AdmObjectType>> objectTypeMap = objectTypes.stream().filter(k-> StringUtils.isNotEmpty(k.getObjType()))
|
|
.collect(Collectors.groupingBy(AdmObjectType::getObjType));
|
|
.collect(Collectors.groupingBy(AdmObjectType::getObjType));
|