Browse Source

fix bug:/dict/category查询对象类型时返回valid为0的数据

lijie 3 years ago
parent
commit
e7747b6cbe

+ 10 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java

@@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
+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;
@@ -62,6 +64,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
         if(AdmDictCategoryEnum.MAJOR.getValue().equals(type)){
             //查询专业分类
             node.put("type",AdmDictCategoryEnum.MAJOR.getValue());
+            node.put(AuditableEntity.PROP_VALID,1);
             criteria.setCriteria(node);
             return doQueryDictData(context, criteria, clazz);
         }
@@ -70,6 +73,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
         if(baseCategory.contains(type)){
             //查询设备类型:equipment,部件类型:component,输入系统类型:system,输入专业类型:major,业务空间类型 space ,资产 property
             node.put("objType",type);
+            node.put(AuditableEntity.PROP_VALID,1);
             criteria.setCriteria(node);
             return doQueryObjectType(context, criteria, clazz);
         }
@@ -79,6 +83,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
             ArrayNode arrayNode = node.putObject("objType").putArray("$in");
             arrayNode.add(AdmDictCategoryEnum.COMPONENT.getValue());
             arrayNode.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
+            node.put(AuditableEntity.PROP_VALID,1);
             criteria.setCriteria(node);
             return doQueryObjectType(context, criteria, clazz);
         }
@@ -101,9 +106,12 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
     private AdmResponse queryDictObjectTypeTree(InstanceUrlParam context ,String type, Class<T> 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();
         Map<String, List<AdmObjectType>> objectTypeMap = objectTypes.stream().filter(k-> StringUtils.isNotEmpty(k.getObjType()))
                 .collect(Collectors.groupingBy(AdmObjectType::getObjType));