浏览代码

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/digital-delivery into develop

lvxianyun 3 年之前
父节点
当前提交
da0ddd5ff6

+ 13 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/enums/DeliveryTypeEnum.java

@@ -0,0 +1,13 @@
+package com.persagy.adm.server.custom.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum DeliveryTypeEnum{
+    PROJECT(0,"项目交付"),SCENE(1,"现场交付");
+    int code;
+    String message;
+
+}

+ 11 - 2
adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/service/impl/SyncAppImpl.java

@@ -22,6 +22,7 @@ import com.persagy.adm.server.custom.dto.ObjectTypeCollectDTO;
 import com.persagy.adm.server.custom.dto.RelationDefineCollectDTO;
 import com.persagy.adm.server.custom.entity.*;
 import com.persagy.adm.server.custom.entity.db.*;
+import com.persagy.adm.server.custom.enums.DeliveryTypeEnum;
 import com.persagy.adm.server.custom.service.*;
 import com.persagy.adm.server.custom.util.DataExtrasUtil;
 import com.persagy.dmp.basic.model.QueryCriteria;
@@ -124,6 +125,8 @@ public class SyncAppImpl implements ISyncApp {
 
 		// 查询基于交付范围的系统和设备定义
 		QueryCriteria criteria = ServiceUtil.getQueryCriteria(objectMapper,AdmConst.OBJ_TYPE_SYSTEM, AdmConst.OBJ_TYPE_EQUIPMENT);
+		// 增加现场交付查询条件
+		criteria.getCriteria().put("deliveryType", DeliveryTypeEnum.SCENE.getCode());
 		List<ObjectTypeCollectDTO> typeList = ServiceUtil.queryAllPage(() -> rwdClient.queryDefineTypeCollect(groupCode, projectId, AdmConst.APP_ID, userId, criteria), criteria, new Pagination(500));
 
 
@@ -143,14 +146,20 @@ public class SyncAppImpl implements ISyncApp {
 
 //		查询基于交付范围的关系定义
 		if(includeRel) {
-			List<RelationDefineCollectDTO> relList = ServiceUtil.call(() -> rwdClient.queryDefineRelCollect(groupCode, projectId, AdmConst.APP_ID, userId, new QueryCriteria()));
+			QueryCriteria queryCriteria = new QueryCriteria();
+			ObjectNode objectNode = objectMapper.createObjectNode();
+			objectNode.put("deliveryType",DeliveryTypeEnum.SCENE.getCode());
+			queryCriteria.setCriteria(objectNode);
+			List<RelationDefineCollectDTO> relList = ServiceUtil.call(() -> rwdClient.queryDefineRelCollect(groupCode, projectId, AdmConst.APP_ID, userId, queryCriteria));
 			data.setRelation(relList);
 		}
 
 		//查询基于交付范围的信息点定义
 		if(includeInfos) {
 			QueryCriteria qc = new QueryCriteria();
-			qc.setCriteria(objectMapper.createObjectNode());
+			ObjectNode objectNode = objectMapper.createObjectNode();
+			objectNode.put("deliveryType",DeliveryTypeEnum.SCENE.getCode());
+			qc.setCriteria(objectNode);
 			List<ObjectInfoCollectDTO> funcList = ServiceUtil.call(() -> rwdClient.queryDefineInfoCollect(groupCode, projectId, AdmConst.APP_ID, userId, qc));
 			data.setInfos(funcList);
 		}