zhangqiankun il y a 3 ans
Parent
commit
7847615256
39 fichiers modifiés avec 662 ajouts et 44 suppressions
  1. 3 3
      src/main/java/com/persagy/proxy/adm/handler/RelationReportHandler.java
  2. 303 0
      src/main/java/com/persagy/proxy/adm/handler/SpaceRelationInfoHandler.java
  3. 4 3
      src/main/java/com/persagy/proxy/adm/model/AdmDCSQueryRequest.java
  4. 4 2
      src/main/java/com/persagy/proxy/adm/service/impl/AdmSpaceServiceImpl.java
  5. 5 2
      src/main/java/com/persagy/proxy/adm/strategy/RelationObjectContext.java
  6. 1 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/AbstractReportRelationObject.java
  7. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java
  8. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2FlRelationObject.java
  9. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2ShRelationObject.java
  10. 9 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2SpRelationObject.java
  11. 9 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2BdRelationObject.java
  12. 9 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2FlRelationObject.java
  13. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchSubsetBd2FlRelationObject.java
  14. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkMixMechRelationObject.java
  15. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkNaturalRelationObject.java
  16. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkOnewayMechRelationObject.java
  17. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqBackupRelationObject.java
  18. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqNormalRelationObject.java
  19. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyBackupRelationObject.java
  20. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyNormalRelationObject.java
  21. 9 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2BdRelationObject.java
  22. 9 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2FlRelationObject.java
  23. 9 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2ShRelationObject.java
  24. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2BdRelationObject.java
  25. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2FlRelationObject.java
  26. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2ShRelationObject.java
  27. 9 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2SpRelationObject.java
  28. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2BdRelationObject.java
  29. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2FlRelationObject.java
  30. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2SpRelationObject.java
  31. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkConnectRelationObject.java
  32. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkTransparentRelationObject.java
  33. 4 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/RelationObjectStrategy.java
  34. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2EqRelationObject.java
  35. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SpRelationObject.java
  36. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SyRelationObject.java
  37. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFCloseRelationObject.java
  38. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFOpenRelationObject.java
  39. 11 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkNormalRelationObject.java

+ 3 - 3
src/main/java/com/persagy/proxy/adm/handler/RelationReportHandler.java

@@ -379,7 +379,7 @@ public class RelationReportHandler {
 		/** key: 建筑ID,value: 建筑名称 */
 		Map<String, String> buildNameTemp = new HashMap<String, String>();
 		String graphAndRelKey = GraphCodeEnum.MechInArch.name() + AdmCommonConstant.UNDERLINE + RelCodeEnum.Eq2Bd.name();
-		List<ObjectDigital> buildDigitals = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey);
+		List<ObjectDigital> buildDigitals = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey, null, null);
 		if (CollectionUtil.isNotEmpty(buildDigitals)) {
 			for (ObjectDigital master : buildDigitals) {
 				List<ObjectDigital> slaveDigitals = master.getRelObjs();
@@ -538,7 +538,7 @@ public class RelationReportHandler {
 	private void findBuildingName(Map<String, String> buildNameTemp, String groupCode, String projectId) {
 		// 获取建筑名称
 		String graphAndRelKey = GraphCodeEnum.MechInArch.name() + AdmCommonConstant.UNDERLINE + RelCodeEnum.Eq2Bd.name();
-		List<ObjectDigital> buildDigitals = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey);
+		List<ObjectDigital> buildDigitals = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey, null, null);
 		if (CollectionUtil.isNotEmpty(buildDigitals)) {
 			for (ObjectDigital master : buildDigitals) {
 				List<ObjectDigital> slaveDigitals = master.getRelObjs();
@@ -560,7 +560,7 @@ public class RelationReportHandler {
 	private void findFloorName(Map<String, String> floorNameTemp, String groupCode, String projectId) {
 		// 获取楼层名称
 		String graphAndRelKey = GraphCodeEnum.MechInArch.name() + AdmCommonConstant.UNDERLINE + RelCodeEnum.Eq2Fl.name();
-		List<ObjectDigital> floorDigitals = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey);
+		List<ObjectDigital> floorDigitals = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey, null, null);
 		if (CollectionUtil.isNotEmpty(floorDigitals)) {
 			for (ObjectDigital master : floorDigitals) {
 				List<ObjectDigital> slaveDigitals = master.getRelObjs();

+ 303 - 0
src/main/java/com/persagy/proxy/adm/handler/SpaceRelationInfoHandler.java

@@ -0,0 +1,303 @@
+package com.persagy.proxy.adm.handler;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Value;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.persagy.dmp.common.context.AppContext;
+import com.persagy.dmp.common.helper.SpringHelper;
+import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.proxy.adm.constant.AdmCommonConstant;
+import com.persagy.proxy.adm.constant.AdmObjectType;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
+import com.persagy.proxy.adm.model.AdmDCSQueryRequest;
+import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.adm.strategy.RelationObjectContext;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021年10月18日 下午6:04:24
+ */
+@RequiredArgsConstructor
+public class SpaceRelationInfoHandler {
+	
+	@Value("${middleware.group.code}")
+	private String defaultCode;
+
+	private final RelationObjectContext relationObjectContext;
+	
+	private final IRelationReportService relationReportService;
+
+	/**
+	 * 查询
+	 *
+	 * @param request
+	 * @return
+	 * @throws Exception
+	 */
+	public JSONObject query(AdmDCSQueryRequest request) throws Exception {
+		List<ObjectNode> resultList = null;
+		String groupCode = AppContext.getContext().getGroupCode();
+		String projectId = AppContext.getContext().getProjectId();
+		
+		Set<String> ascOrder = new HashSet<String>();
+		Set<String> descOrder = new HashSet<String>();
+		String orders = request.getOrders();
+		if (StrUtil.isNotBlank(orders)) {
+			String[] split = orders.split(",");
+			for (String order : split) {
+				if (order.endsWith(" desc")) {
+					descOrder.add(order.split(" ")[0]);
+				} else {
+					ascOrder.add(order.split(" ")[0]);
+				}
+			}
+		}
+		
+		JSONObject result = new JSONObject();
+		result.put("result", "success");
+		
+		String floorId = request.getFloorId();
+		String buildingId = request.getBuildingId();
+		Set<String> zoneTypeList = StrUtil.isNotEmpty(request.getZoneType()) ? Sets.newHashSet(request.getZoneType()) 
+				: (request.getZoneTypeList() == null ? Sets.newHashSet() : request.getZoneTypeList());
+		
+		if (StrUtil.isNotBlank(buildingId) && StrUtil.isNotBlank(floorId) && !"isnull".equals(floorId)) {
+			// 当建筑ID不为空、楼层ID不为空时
+			String graphAndRelKey = GraphCodeEnum.ArchForArch.name() + AdmCommonConstant.UNDERLINE + RelCodeEnum.Sp2Fl.name();
+			List<ObjectDigital> allRelations = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey, null, Sets.newHashSet(buildingId));
+			if (CollectionUtil.isNotEmpty(allRelations)) {
+				resultList = this.transferSpaceInfo(allRelations, buildingId);
+			}
+			
+		} else if (StrUtil.isNotBlank(buildingId) && StrUtil.isNotBlank(floorId) && "isnull".equals(floorId)) {
+			// 当建筑ID不为空、楼层ID为空时
+			this.querySpaceInfo(request, groupCode, projectId, buildingId, zoneTypeList, ascOrder, descOrder);
+			
+		} else if (StrUtil.isNotBlank(buildingId) && StrUtil.isBlank(floorId) && !"isnull".equals(buildingId)) {
+			// 当建筑ID不为空、楼层ID为空时
+			String graphAndRelKey = GraphCodeEnum.ArchForArch.name() + AdmCommonConstant.UNDERLINE + RelCodeEnum.Sp2Bd.name();
+			List<ObjectDigital> allRelations = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey, null, Sets.newHashSet(buildingId));
+			if (CollectionUtil.isNotEmpty(allRelations)) {
+				resultList = this.transferSpaceInfo(allRelations, buildingId);
+			}
+			
+		} else if (StrUtil.isNotBlank(buildingId) && StrUtil.isBlank(floorId) && "isnull".equals(buildingId)) {
+			resultList = this.querySpaceInfo(request, groupCode, projectId, zoneTypeList, ascOrder, descOrder);
+			
+		} else if (StrUtil.isBlank(buildingId) && StrUtil.isBlank(floorId)) {
+			// 直接获取所有的空间数据
+			List<ObjectNode> spacelist = this.relationReportService.queryObjects(groupCode, projectId, null, zoneTypeList, 
+					Sets.newHashSet(AdmObjectType.SPACE.getIndex()), ascOrder, descOrder);
+			resultList = this.fillSpaceInfo(spacelist, null, null);
+		}
+		
+		result.put("zoneType", request.getZoneType());
+		result.put("floorId", request.getFloorId());
+		result.put("total", CollectionUtil.isEmpty(resultList) ? 0 : resultList.size());
+		result.put("content", CollectionUtil.isEmpty(resultList) ? Lists.newArrayList() : resultList);
+		return result;
+	}
+
+	/**
+	 * 获取空间信息,当楼层ID为空,建筑ID为空时
+	 * 
+	 * @param request
+	 * @param groupCode
+	 * @param projectId
+	 * @return
+	 */
+	private List<ObjectNode> querySpaceInfo(AdmDCSQueryRequest request, String groupCode, String projectId, Set<String> zoneTypeList, 
+			Set<String> ascOrder, Set<String> descOrder) {
+		List<ObjectNode> resultList = null;
+		// 获取所有的建筑ID集合
+		List<ObjectNode> buildList = this.relationReportService.queryObjects(groupCode, projectId, null, null, 
+				Sets.newHashSet(AdmObjectType.BUILDING.getIndex()), null, null);
+		if (CollectionUtil.isNotEmpty(buildList)) {
+			for (ObjectNode objectNode : buildList) {
+				String buildingId = objectNode.get("id").asText();
+				// 获取所有的空间数据
+				String graphAndRelKey = GraphCodeEnum.MechInArch.name() + AdmCommonConstant.UNDERLINE + RelCodeEnum.Eq2Fl.name();
+				List<ObjectDigital> allRelations = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey, null, Sets.newHashSet(buildingId));
+				if (CollectionUtil.isNotEmpty(allRelations)) {
+					// 获取所有的对象数据
+					resultList = this.transferSpaceInfo(allRelations, buildingId);
+				}
+			}
+		} else {
+			// 获取所有的空间数据
+			List<ObjectNode> spacelist = this.relationReportService.queryObjects(groupCode, projectId, null, zoneTypeList, 
+					Sets.newHashSet(AdmObjectType.SPACE.getIndex()), ascOrder, descOrder);
+			resultList = this.fillSpaceInfo(spacelist, null, null);
+		}
+		
+		return resultList;
+	}
+	
+	/**
+	 * 转换数据
+	 * 
+	 * @param allRelations
+	 * @param buildingId
+	 * @return
+	 */
+	private List<ObjectNode> transferSpaceInfo(List<ObjectDigital> allRelations, String buildingId) {
+		if (CollectionUtil.isEmpty(allRelations)) {
+			return null;
+		}
+		
+		List<ObjectNode> resultList = new ArrayList<ObjectNode>();
+		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
+		for (ObjectDigital objectDigital : allRelations) {
+			ObjectNode result = objectMapper.createObjectNode();
+			
+			ObjectNode infos = objectDigital.getInfos();
+			result.put("bimLocation", infos.has("bimLocation") ? infos.get("bimLocation").asText() : null);
+			result.put("height", infos.has("height") ? infos.get("height").asText() : null);
+			result.put("outline", infos.has("outline") ? infos.get("outline").asText() : null);
+			result.put("floorId", "");
+			result.put("buildingId", buildingId);
+			result.put("classCode", objectDigital.getClassCode());
+			result.put("id", objectDigital.getId());
+			result.put("projectId", objectDigital.getProjectId());
+			result.put("localName", objectDigital.getLocalName());
+			result.put("name", objectDigital.getName());
+			result.putPOJO("infos", new JSONArray());
+			result.putPOJO("statistics", new JSONArray());
+			result.put("state", objectDigital.getValid());
+			result.put("createTime", objectDigital.getCreationTime().toString("yyyy-MM-dd HH:mm:ss"));
+			
+			resultList.add(result);
+		}
+		
+		resultList.sort((r1, r2) -> {
+			return r2.get("createTime").asText().compareTo(r1.get("").asText());
+		});
+		
+		return resultList;
+	}
+
+	/**
+	 * 获取空间信息,当楼层ID为空,建筑ID为空时
+	 * 
+	 * @param request
+	 * @param groupCode
+	 * @param projectId
+	 * @param ascOrder
+	 * @param descOrder
+	 * @param buildingId
+	 * @param spaceIds
+	 * @param floorIds
+	 * @param zoneTypeList
+	 */
+	private List<ObjectNode> querySpaceInfo(AdmDCSQueryRequest request, String groupCode, String projectId, String buildingId, 
+			Set<String> zoneTypeList, Set<String> ascOrder, Set<String> descOrder) {
+		List<ObjectNode> resultList = null;
+		Set<String> spaceIds = new HashSet<String>();
+		Set<String> floorIds = new HashSet<String>();
+		Set<String> notBuildSpace = new HashSet<String>();
+		// 获取所有的楼层ID集合
+		List<ObjectRelation> relationObjects = this.queryObjectRelation(groupCode, projectId, GraphCodeEnum.ArchForArch.name(), RelCodeEnum.Fl2Bd.name(), null, Sets.newHashSet(buildingId));
+		
+		// 获取所有楼层下的空间数据
+		if (CollectionUtil.isNotEmpty(relationObjects)) {
+			for (ObjectRelation objectRelation : relationObjects) {
+				floorIds.add(objectRelation.getObjFrom());
+			}
+			
+			// 根据楼层ID,获取所有的空间ID
+			relationObjects = this.queryObjectRelation(groupCode, projectId, GraphCodeEnum.ArchForArch.name(), RelCodeEnum.Sp2Fl.name(), null, floorIds);
+			for (ObjectRelation objectRelation : relationObjects) {
+				spaceIds.add(objectRelation.getObjFrom());
+			}
+			// 再获取此建筑下,不是这些空间的空间
+			relationObjects = this.queryObjectRelation(groupCode, projectId, GraphCodeEnum.ArchForArch.name(), RelCodeEnum.Sp2Bd.name(), null, Sets.newHashSet(buildingId));
+			for (ObjectRelation objectRelation : relationObjects) {
+				if (!spaceIds.contains(objectRelation.getObjFrom())) {
+					notBuildSpace.add(objectRelation.getObjFrom());
+				}
+			}
+			
+			if (CollectionUtil.isNotEmpty(notBuildSpace)){
+				// 获取所有的对象数据
+				resultList = this.relationReportService.queryObjects(groupCode, projectId, notBuildSpace, zoneTypeList, 
+    					Sets.newHashSet(AdmObjectType.SPACE.getIndex()), ascOrder, descOrder);
+    			this.fillSpaceInfo(resultList, buildingId, null);
+            }
+		} else {
+			// 获取所有的空间数据
+			String graphAndRelKey = GraphCodeEnum.MechInArch.name() + AdmCommonConstant.UNDERLINE + RelCodeEnum.Eq2Fl.name();
+			List<ObjectDigital> allRelations = this.relationObjectContext.queryAllRelations(groupCode, projectId, graphAndRelKey, null, Sets.newHashSet(buildingId));
+			if (CollectionUtil.isNotEmpty(allRelations)) {
+				resultList = this.transferSpaceInfo(allRelations, buildingId);
+			}
+		}
+		
+		spaceIds.clear();
+		notBuildSpace.clear();
+		return resultList;
+	}
+	
+	/**
+	 * 数据填充
+	 * 
+	 * @param queryObjects
+	 * @param buildingId
+	 * @param floorId
+	 * @return
+	 */
+	private List<ObjectNode> fillSpaceInfo(List<ObjectNode> queryObjects, String buildingId, String floorId) {
+		for (ObjectNode objectNode : queryObjects) {
+			String infos = objectNode.has("infos") ? objectNode.get("infos").asText() : null;
+			if (StrUtil.isNotBlank(infos)) {
+				JSONObject infoObject = JSONObject.parseObject(infos);
+				objectNode.put("bimLocation", infoObject.getString("bimLocation"));
+				objectNode.put("height", infoObject.getDouble("height"));
+				objectNode.put("outline", infoObject.getString("outline"));
+				objectNode.put("floorId", floorId);
+				objectNode.put("buildingId", buildingId);
+			}
+			
+			objectNode.putPOJO("infos", new JSONArray());
+			objectNode.putPOJO("statistics", new JSONArray());
+			objectNode.put("state", objectNode.has("valid") ? objectNode.get("valid").asInt(1) : 1);
+		}
+		
+		return queryObjects;
+	}
+	
+	/**
+	 * 获取关系数据
+	 * 
+	 * @param groupCode
+	 * @param projectId
+	 * @param graphCode
+	 * @param relCode
+	 * @param objFroms
+	 * @param objTos
+	 * @return
+	 */
+	private List<ObjectRelation> queryObjectRelation(String groupCode, String projectId, String graphCode, String relCode, Set<String> objFroms, Set<String> objTos) {
+		List<ObjectRelation> relationObjects = this.relationReportService.findRelationObjects(groupCode, projectId, graphCode, relCode, objFroms, objTos);
+		return CollectionUtil.isEmpty(relationObjects) ? Lists.newArrayList() : relationObjects;
+	}
+
+}

+ 4 - 3
src/main/java/com/persagy/proxy/adm/model/AdmDCSQueryRequest.java

@@ -1,11 +1,12 @@
 package com.persagy.proxy.adm.model;
 
+import java.util.Set;
+
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
  * 业务空间查询请求体
  * @author lvxy
@@ -26,5 +27,5 @@ public class AdmDCSQueryRequest extends AdmQueryCriteria {
     private String zoneType;
 
     /** 空间类型 空间类型列表 */ 
-    private List<String> zoneTypeList;
+    private Set<String> zoneTypeList;
 }

+ 4 - 2
src/main/java/com/persagy/proxy/adm/service/impl/AdmSpaceServiceImpl.java

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Sets;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
@@ -98,7 +99,8 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
         //TODO 这个ifelse判断是原来的代码实现,写此方法实现的时候不清楚实际业务,保留原来的判断,之后了解业务再根据业务调整
         DmpResult<JSONArray> dmpResult = new DmpResult<>();
         List spaceArray = new ArrayList();
-        List<String> zoneTypeList = StrUtil.isNotEmpty(request.getZoneType()) ? CollUtil.newArrayList(request.getZoneType()) : request.getZoneTypeList();
+        Set<String> zoneTypeList = StrUtil.isNotEmpty(request.getZoneType()) ? Sets.newHashSet(request.getZoneType()) 
+				: (request.getZoneTypeList() == null ? Sets.newHashSet() : request.getZoneTypeList());
         if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isNotEmpty(request.getFloorId()) && !request.getFloorId().equals("isnull")){
             querySpaceByFl(dmpRequest,context, spaceArray, zoneTypeList, request.getFloorId(), "Fl2Sp");
 
@@ -168,7 +170,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
      * @param objFrom  flooIds /  bulidingIds
      * @param relCode
      */
-    private void querySpaceByFl(QueryCriteria dmpRequest, InstanceUrlParam context, List spaceArray, List<String> zoneTypeList, String objFrom, String relCode){
+    private void querySpaceByFl(QueryCriteria dmpRequest, InstanceUrlParam context, List spaceArray, Set<String> zoneTypeList, String objFrom, String relCode){
         QueryCriteria queryCriteria = ensureQueryCommParm(dmpRequest,context, zoneTypeList, AdmSpace.OBJ_TYPE);
         addRelationTo(queryCriteria,objFrom,relCode);
         DmpResult<JSONArray> dmpResult = queryObj(context, queryCriteria);

+ 5 - 2
src/main/java/com/persagy/proxy/adm/strategy/RelationObjectContext.java

@@ -3,6 +3,7 @@ package com.persagy.proxy.adm.strategy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.annotation.Resource;
 
@@ -100,10 +101,12 @@ public class RelationObjectContext {
 	 * @param groupCode 集团编码
 	 * @param projectId 项目ID
 	 * @param relType  graphCode_relCode
+	 * @param mainContent	主对象的筛选关键字,筛选范围为id,name,local_id,local_name,cADID.为关系左侧对象
+	 * @param slaveContent	从对象的筛选关键字.objTo对应的对象,筛选范围为id,name,local_id,local_name.为关系右侧对象
 	 */
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String relType) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String relType, String mainContent, Set<String> slaveContent) {
 		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(relType);
-		return strategy == null ? Lists.newArrayList() : strategy.queryAllRelations(groupCode, projectId);
+		return strategy == null ? Lists.newArrayList() : strategy.queryAllRelations(groupCode, projectId, mainContent, slaveContent);
 	}
 	
 	/**

+ 1 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/AbstractReportRelationObject.java

@@ -30,7 +30,7 @@ public abstract class AbstractReportRelationObject extends AbstractRelationObjec
 
 	@Override
 	public List<AdmRelationObject> exportRelationObject(String groupCode, String projectId) {
-		List<ObjectDigital> masterObjs = this.queryAllRelations(groupCode, projectId);
+		List<ObjectDigital> masterObjs = this.queryAllRelations(groupCode, projectId, null, null);
 		// 转换中台数据
 		return this.handleObjectDigital(masterObjs, groupCode, projectId);
 	}

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class ArchForArchSh2BdRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sh2Bd.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		List<ObjectDigital> allDigitals = new ArrayList<ObjectDigital>();

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2FlRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class ArchForArchSh2FlRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sh2Fl.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		List<ObjectDigital> allDigitals = new ArrayList<ObjectDigital>();

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2ShRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class ArchForArchSh2ShRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sh2Sh.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 9 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2SpRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,7 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -50,10 +52,16 @@ public class ArchForArchSh2SpRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sh2Sp.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 9 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2BdRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,7 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -50,10 +52,16 @@ public class ArchForArchSp2BdRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sp2Bd.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 9 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2FlRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,7 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -50,10 +52,16 @@ public class ArchForArchSp2FlRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sp2Fl.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchSubsetBd2FlRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -18,6 +19,9 @@ import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -46,10 +50,16 @@ public class ArchSubsetBd2FlRelationObject extends AbstractRelationObject {
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.ArchSubset.name());
 		requestData.setRelCode(RelCodeEnum.Bd2Fl.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkMixMechRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.SpaceTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class ConvectionNetworkMixMechRelationObject extends AbstractReportRelati
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_2.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_2.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkNaturalRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.SpaceTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class ConvectionNetworkNaturalRelationObject extends AbstractReportRelati
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_1.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_1.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkOnewayMechRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.SpaceTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class ConvectionNetworkOnewayMechRelationObject extends AbstractReportRel
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_3.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_3.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqBackupRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class EquipPowerEqBackupRelationObject extends AbstractReportRelationObje
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_2.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_2.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqNormalRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class EquipPowerEqNormalRelationObject extends AbstractReportRelationObje
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_1.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_1.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyBackupRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class EquipPowerSyBackupRelationObject extends AbstractReportRelationObje
 	}
 
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_4.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_4.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyNormalRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class EquipPowerSyNormalRelationObject extends AbstractReportRelationObje
 	}
 
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_3.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_3.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 9 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2BdRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,7 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -50,10 +52,16 @@ public class MechForArchEq2BdRelationObject extends AbstractReportRelationObject
 	}
 
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.EQ2BD_FOR.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.EQ2BD_FOR.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 9 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2FlRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,7 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -50,10 +52,16 @@ public class MechForArchEq2FlRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
 		requestData.setRelCode(RelCodeEnum.Eq2Fl.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 9 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2ShRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,7 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -50,10 +52,16 @@ public class MechForArchEq2ShRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
 		requestData.setRelCode(RelCodeEnum.Eq2Sh.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2BdRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class MechForArchSy2BdRelationObject extends AbstractReportRelationObject
 	}
 
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sy2Bd.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2FlRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class MechForArchSy2FlRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sy2Fl.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2ShRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class MechForArchSy2ShRelationObject extends AbstractReportRelationObject
 	}
 
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sy2Sh.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 9 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2SpRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,7 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -50,10 +52,16 @@ public class MechForArchSy2SpRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
 		requestData.setRelCode(RelCodeEnum.Sy2Sp.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2BdRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class MechInArchEq2BdRelationObject extends AbstractReportRelationObject
 	}
 
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechInArch.name());
 		requestData.setRelCode(RelCodeEnum.Eq2Bd.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2FlRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class MechInArchEq2FlRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechInArch.name());
 		requestData.setRelCode(RelCodeEnum.Eq2Fl.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2SpRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -20,6 +21,9 @@ import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -48,10 +52,16 @@ public class MechInArchEq2SpRelationObject extends AbstractReportRelationObject
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(GraphCodeEnum.MechInArch.name());
 		requestData.setRelCode(RelCodeEnum.Eq2Sp.name());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkConnectRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.SpaceTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class RadiationNetworkConnectRelationObject extends AbstractReportRelatio
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_1.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_1.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkTransparentRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.SpaceTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class RadiationNetworkTransparentRelationObject extends AbstractReportRel
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_2.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_2.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 4 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/RelationObjectStrategy.java

@@ -3,6 +3,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -60,9 +61,11 @@ public interface RelationObjectStrategy {
 	 * 
 	 * @param groupCode 集团编码
 	 * @param projectId 项目ID
+	 * @param mainContent	主对象的筛选关键字,筛选范围为id,name,local_id,local_name,cADID.为关系左侧对象
+	 * @param slaveContent	从对象的筛选关键字.objTo对应的对象,筛选范围为id,name,local_id,local_name.为关系右侧对象
 	 * @return 不会返回null
 	 */
-	List<ObjectDigital> queryAllRelations(String groupCode, String projectId);
+	List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent);
 	
 	/**
 	 * 分页查询关系对象数据

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2EqRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class SensorRelationshipSs2EqRelationObject extends AbstractReportRelatio
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.EQ2EQ_SENSORRELATIONSHIP_SS2EQ.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.EQ2EQ_SENSORRELATIONSHIP_SS2EQ.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SpRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 图类型编码 -- SensorRelationship
  * 
@@ -48,10 +52,16 @@ public class SensorRelationshipSs2SpRelationObject extends AbstractReportRelatio
 	}
 
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SyRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class SensorRelationshipSs2SyRelationObject extends AbstractReportRelatio
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.EQ2SY_SENSORRELATIONSHIP_SS2SY.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.EQ2SY_SENSORRELATIONSHIP_SS2SY.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFCloseRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.SpaceTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class TrafficNetworkFFCloseRelationObject extends AbstractReportRelationO
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_3.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_3.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFOpenRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.SpaceTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class TrafficNetworkFFOpenRelationObject extends AbstractReportRelationOb
 	}
 	
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_2.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_2.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);
 		

+ 11 - 1
src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkNormalRelationObject.java

@@ -2,6 +2,7 @@ package com.persagy.proxy.adm.strategy.relationdata;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
@@ -19,6 +20,9 @@ import com.persagy.proxy.adm.constant.SpaceTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * 
  * @version 1.0.0
@@ -47,10 +51,16 @@ public class TrafficNetworkNormalRelationObject extends AbstractReportRelationOb
 	}
 
 	@Override
-	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId) {
+	public List<ObjectDigital> queryAllRelations(String groupCode, String projectId, String mainContent, Set<String> slaveContent) {
 		RequestData requestData = new RequestData();
 		requestData.setGraphCode(AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_1.getGraphCode());
 		requestData.setRelCode(AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_1.getRelCode());
+		if (StrUtil.isNotBlank(mainContent)) {
+			requestData.setMainContent(mainContent);
+		}
+		if (CollectionUtil.isNotEmpty(slaveContent)) {
+			requestData.setSlaveContent(slaveContent);
+		}
 		requestData.setPage(1L);
 		requestData.setSize(500L);