Quellcode durchsuchen

Merge branch 'hostfix_v0.4.0' into develop

# Conflicts:
#	adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java
lijie vor 3 Jahren
Ursprung
Commit
2c6a4865de

+ 21 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/constant/SpaceTypeEnum.java

@@ -12,25 +12,44 @@ import lombok.Getter;
  */
 @Getter
 public enum SpaceTypeEnum {
-
+	/**物业分区*/
 	GeneralZone("GeneralZone", "物业分区"),
+	/**供电分区*/
 	PowerSupplyZone("PowerSupplyZone", "供电分区"),
+	/**照明分区*/
 	LightingZone("LightingZone", "照明分区"),
+	/**网络分区*/
 	NetworkZone("NetworkZone", "网络分区"),
+	/**空调分区*/
 	AirConditioningZone("AirConditioningZone", "空调分区"),
+	/**采暖分区*/
 	HeatingZone("HeatingZone", "采暖分区"),
+	/**洁净分区*/
 	CleanZone("CleanZone", "洁净分区"),
+	/**生活给水分区*/
 	DomesticWaterSupplyZone("DomesticWaterSupplyZone", "生活给水分区"),
+	/**防火分区*/
 	FireZone("FireZone", "防火分区"),
+	/**安防分区*/
 	SecurityZone("SecurityZone", "安防分区"),
+	/**租户分区*/
 	TenantZone("TenantZone", "租户分区"),
+	/**功能分区*/
 	FunctionZone("FunctionZone", "功能分区"),
+	/**客流分区*/
 	PassengerFlowZone("PassengerFlowZone", "客流分区"),
+	/**疏散分区*/
 	EvacuateZone("EvacuateZone", "疏散分区"),
+	/**环境分区*/
 	EnvironmentZone("EnvironmentZone", "环境分区"),
+	/**其他分区*/
 	OtherZone("OtherZone", "其他分区"),
+	/**主要功能区*/
 	MajorOperationZone("MajorOperationZone", "主要功能区"),
-	ParkingZone("ParkingZone", "停车分区");
+	/**停车分区*/
+	ParkingZone("ParkingZone", "停车分区"),
+	/**主要功能区*/
+	partition("partition", "主要功能区");
 
 	private String code;
     private String desc;

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

@@ -8,6 +8,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
 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.AdmDictCategoryEnum;
 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)){
             //查询专业分类
             node.put("type",AdmDictCategoryEnum.MAJOR.getValue());
+            node.put(AuditableEntity.PROP_VALID,1);
             criteria.setCriteria(node);
             admResponse = doQueryDictData(context, criteria, clazz);
         }
@@ -65,6 +70,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);
             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.add(AdmDictCategoryEnum.COMPONENT.getValue());
             arrayNode.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
+            node.put(AuditableEntity.PROP_VALID,1);
             criteria.setCriteria(node);
             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){
         //查询所有的专业
         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));

+ 7 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmSystemServiceImpl.java

@@ -4,11 +4,15 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;
@@ -102,7 +106,7 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
 
     @Override
     public void processDmpCriteria(QueryCriteria dmpRequest) {
-        /*ObjectNode criteria = dmpRequest.getCriteria();
+        ObjectNode criteria = dmpRequest.getCriteria();
         if (null==criteria){
             return;
         }
@@ -134,13 +138,14 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
             }
             criteria.set("relationFrom",relationFrom);
             criteria.remove("buildingId");
-        }*/
+        }
     }
 
     @Override
     public AdmResponse queryNewInternal(String buildingId, String floorId, AdmQueryCriteria request) {
         constructQueryNewParam(buildingId,floorId,request);
         QueryCriteria rwdQueryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
+        processDmpCriteria(rwdQueryCriteria);
         if(JSONUtil.isNull(rwdQueryCriteria.getCriteria())){
             return AdmResponse.failure("请求参数错误");
         }

+ 0 - 1
docker/dockerfiles/adm-middleware/Dockerfile

@@ -16,7 +16,6 @@ ENV TZ Asia/Shanghai
 ARG WORKER_HOME
 
 #执行的命令
-RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
 
 RUN mkdir -p $WORKER_HOME/config

+ 0 - 1
docker/dockerfiles/adm-server/Dockerfile

@@ -16,7 +16,6 @@ ENV TZ Asia/Shanghai
 ARG WORKER_HOME
 
 #执行的命令
-RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
 
 RUN mkdir -p $WORKER_HOME/config