Prechádzať zdrojové kódy

更改class实例名为BDTP的图类型编码和边类型编码的组合

zhangqiankun 3 rokov pred
rodič
commit
d2d90fbbe5
38 zmenil súbory, kde vykonal 352 pridanie a 216 odobranie
  1. 4 0
      src/main/java/com/persagy/proxy/adm/constant/AdmCommonConstant.java
  2. 84 35
      src/main/java/com/persagy/proxy/adm/constant/AdmRelationType.java
  3. 1 1
      src/main/java/com/persagy/proxy/adm/controller/ComponentBuildingController.java
  4. 36 0
      src/main/java/com/persagy/proxy/adm/controller/RelationReportController.java
  5. 4 3
      src/main/java/com/persagy/proxy/adm/service/impl/RelationReportService.java
  6. 32 5
      src/main/java/com/persagy/proxy/adm/strategy/RelationObjectContext.java
  7. 9 7
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2BdForRelationObject.java
  8. 9 8
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2FlForRelationObject.java
  9. 9 7
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2ShForRelationObject.java
  10. 10 9
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2SpForRelationObject.java
  11. 9 8
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2BdForRelationObject.java
  12. 9 8
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2FlForRelationObject.java
  13. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Bd2FlSubRelationObject.java
  14. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpMixMechRelationObject.java
  15. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpNaturalRelationObject.java
  16. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpOnewayMechRelationObject.java
  17. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqEqBackupRelationObject.java
  18. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqEqNormalRelationObject.java
  19. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqSyBackupRelationObject.java
  20. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqSyNormalRelationObject.java
  21. 6 5
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2BdForRelationObject.java
  22. 9 8
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2FlForRelationObject.java
  23. 10 9
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2ShForRelationObject.java
  24. 9 7
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2BdForRelationObject.java
  25. 8 7
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2FlForRelationObject.java
  26. 9 7
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2ShForRelationObject.java
  27. 10 9
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2SpForRelationObject.java
  28. 9 8
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2BdRelationObject.java
  29. 9 7
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2FlRelationObject.java
  30. 9 8
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2SpRelationObject.java
  31. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpTransparentRelationObject.java
  32. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpConnectRelationObject.java
  33. 3 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2EqShipRelationObject.java
  34. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2SpShipRelationObject.java
  35. 3 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2SyShipRelationObject.java
  36. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpFFCloseRelationObject.java
  37. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpFFOpenRelationObject.java
  38. 3 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpNormalRelationObject.java

+ 4 - 0
src/main/java/com/persagy/proxy/adm/constant/AdmCommonConstant.java

@@ -1,11 +1,15 @@
 package com.persagy.proxy.adm.constant;
 
+import java.util.Map;
+
 /**
  * ADM 通用常量
  * @author Charlie Yu
  * @date 2021-08-16
  */
 public interface AdmCommonConstant {
+	/** ADM 边类型 -> 枚举类 */
+	static Map<String, AdmRelationTypeEnum> RELATION_TYPE_MAP = AdmRelationTypeEnum.getRelationTypeMap();
 	
 	/** 项目根路径*/
 	String SERVER_ROOT_PATH = System.getProperty("user.dir");

+ 84 - 35
src/main/java/com/persagy/proxy/adm/constant/AdmRelationType.java

@@ -1,8 +1,7 @@
 package com.persagy.proxy.adm.constant;
 
 /**
- * 数据的来源为 {@link com.persagy.proxy.adm.constant.AdmRelationTypeEnum} 的relationType字段
- * 部分字段为自定义
+ * BDTP中台图类型编码和边类型编码的组合名称
  * 
  * @version 1.0.0
  * @company persagy 
@@ -11,69 +10,119 @@ package com.persagy.proxy.adm.constant;
  */
 public interface AdmRelationType {
 
-	/** Bd2Fl_ArchSubset  表示从属关系*/
-	String BD2FL_ARCHSUBSET = "bd2fl_ArchSubset";
+	/** MECHINARCH_EQ2BD  设备所在建筑*/
+	String MECHINARCH_EQ2BD = "MechInArch_Eq2Bd";
 	
-	String EQ2BD = "eq2bd";
+	/** MECHINARCH_EQ2FL  设备所在楼层*/
+	String MECHINARCH_EQ2FL = "MechInArch_Eq2Fl";
 	
-	String EQ2FL = "eq2fl";
+	/** MECHINARCH_EQ2SH  设备所在竖井*/
+	String MECHINARCH_EQ2SH = "MechInArch_Eq2Sh";
 	
-	String EQ2SP = "eq2sp";
+	/** MECHINARCH_EQ2BD  设备所在空间*/
+	String MECHINARCH_EQ2SP = "MechInArch_Eq2Sp";
 
-	String EQ2BD_FOR = "eq2bd_for";
 	
-	String EQ2FL_FOR = "eq2fl_for";
 	
-	String EQ2SH_FOR = "eq2sh_for";
+	/** MECHFORARCH_EQ2BD  设备服务于建筑*/
+	String MECHFORARCH_EQ2BD = "MechForArch_Eq2Bd";
 	
-	String SY2BD_FOR = "sy2bd_for";
+	/** MECHFORARCH_EQ2FL  设备服务于楼层*/
+	String MECHFORARCH_EQ2FL = "MechForArch_Eq2Fl";
 	
-	String SY2FL_FOR = "sy2fl_for";
+	/** MECHFORARCH_EQ2SH  设备服务于竖井*/
+	String MECHFORARCH_EQ2SH = "MechForArch_Eq2Sh";
 	
-	String SY2SH_FOR = "sy2sh_for";
+	/** MECHFORARCH_SY2BD  系统服务于建筑*/
+	String MECHFORARCH_SY2BD = "MechForArch_Sy2Bd";
 	
-	String SY2SP_FOR = "sy2sp_for";
+	/** MECHFORARCH_SY2FL  系统服务于楼层*/
+	String MECHFORARCH_SY2FL = "MechForArch_Sy2Fl";
 	
-	String SH2BD_ARCHFORARCH = "sh2bd_ArchForArch";
+	/** MECHFORARCH_SY2SH  系统服务于竖井*/
+	String MECHFORARCH_SY2SH = "MechForArch_Sy2Sh";
 	
-	String SH2FL_ARCHFORARCH = "sh2fl_ArchForArch";
+	/** MECHFORARCH_SY2SP  系统服务于空间*/
+	String MECHFORARCH_SY2SP = "MechForArch_Sy2Sp";
 	
-	String SH2SH_ARCHFORARCH = "sh2sh_ArchForArch";
 	
-	String SH2SP_ARCHFORARCH = "sh2sp_ArchForArch";
 	
-	String SP2BD_ARCHFORARCH = "sp2bd_ArchForArch";
+	/** ARCHSUBSET_BD2FL  建筑下的楼层*/
+	String ARCHSUBSET_BD2FL = "ArchSubset_Bd2Fl";
 	
-	String SP2FL_ARCHFORARCH ="sp2fl_ArchForArch";
 	
-	String SP2SP_RADIATIONNETWORK_2 = "sp2sp_RadiationNetwork_2";
 	
-	String SP2SP_RADIATIONNETWORK_1 = "sp2sp_RadiationNetwork_1";
+	/** ARCHFORARCH_SH2BD  竖井服务于建筑*/
+	String ARCHFORARCH_SH2BD = "ArchForArch_Sh2Bd";
 	
-	String SP2SP_CONVECTIONNETWORK_2 = "sp2sp_ConvectionNetwork_2";
+	/** ARCHFORARCH_SH2FL  竖井服务于楼层*/
+	String ARCHFORARCH_SH2FL = "ArchForArch_Sh2Fl";
 	
-	String SP2SP_CONVECTIONNETWORK_3 = "sp2sp_ConvectionNetwork_3";
+	/** ARCHFORARCH_SH2SH  竖井服务于竖井*/
+	String ARCHFORARCH_SH2SH = "ArchForArch_Sh2Sh";
 	
-	String SP2SP_CONVECTIONNETWORK_1 = "sp2sp_ConvectionNetwork_1";
+	/** ARCHFORARCH_SH2SP  竖井服务于空间*/
+	String ARCHFORARCH_SH2SP = "ArchForArch_Sh2Sp";
 	
-	String SP2SP_TRAFFICNETWORK_3 = "sp2sp_TrafficNetwork_3";
+	/** ARCHFORARCH_SP2BD  空间服务于建筑*/
+	String ARCHFORARCH_SP2BD = "ArchForArch_Sp2Bd";
 	
-	String SP2SP_TRAFFICNETWORK_2 = "sp2sp_TrafficNetwork_2";
+	/** ARCHFORARCH_SP2FL  空间服务于楼层*/
+	String ARCHFORARCH_SP2FL = "ArchForArch_Sp2Fl";
 	
-	String SP2SP_TRAFFICNETWORK_1 = "sp2sp_TrafficNetwork_1";
 	
-	String EQ2EQ_EQUIPPOWER_1 = "eq2eq_EquipPower_1";
 	
-	String EQ2EQ_EQUIPPOWER_2 = "eq2eq_EquipPower_2";
+	/** EQUIPPOWER_EQBACKUP  设备备用电源-低/高压开关柜→用电设备*/
+	String EQUIPPOWER_EQBACKUP = "EquipPower_EqBackup";
 	
-	String EQ2EQ_EQUIPPOWER_3 = "eq2eq_EquipPower_3";
+	/** EQUIPPOWER_EQNORMAL  设备常规电源-低/高压开关柜→用电设备*/
+	String EQUIPPOWER_EQNORMAL = "EquipPower_EqNormal";
 	
-	String EQ2EQ_EQUIPPOWER_4 = "eq2eq_EquipPower_4";
+	/** EQUIPPOWER_SYBACKUP  系统备用电源-低/高压开关柜→用电设备*/
+	String EQUIPPOWER_SYBACKUP = "EquipPower_SyBackup";
 	
-	String EQ2EQ_SENSORRELATIONSHIP_SS2EQ = "eq2eq_SensorRelationship_ss2eq";
+	/** EQUIPPOWER_SYNORMAL  系统常规电源-低/高压开关柜→用电设备*/
+	String EQUIPPOWER_SYNORMAL = "EquipPower_SyNormal";
 	
-	String EQ2SY_SENSORRELATIONSHIP_SS2SY = "eq2sy_SensorRelationship_ss2sy";
 	
-	String EQ2SP_SENSORRELATIONSHIP_SS2SP = "eq2sp_SensorRelationship_ss2sp";
+	
+	/** RADIATIONNETWORK_TRANSPARENT  光照透明隔断-空间-空间*/
+	String RADIATIONNETWORK_TRANSPARENT = "RadiationNetwork_Transparent";
+	
+	/** RADIATIONNETWORK_CONNECT  光照连通-空间-空间*/
+	String RADIATIONNETWORK_CONNECT = "RadiationNetwork_Connect";
+	
+	
+	
+	/** TRAFFICNETWORK_FFCLOSE  消防常关交通-空间-空间*/
+	String TRAFFICNETWORK_FFCLOSE = "TrafficNetwork_FFClose";
+	
+	/** TRAFFICNETWORK_FFOPEN  消防常开交通-业务空间-业务空间*/
+	String TRAFFICNETWORK_FFOPEN = "TrafficNetwork_FFOpen";
+
+	/** TRAFFICNETWORK_NORMAL  普通交通-空间-空间*/
+	String TRAFFICNETWORK_NORMAL = "TrafficNetwork_Normal";
+	
+	
+	
+	/** CONVECTIONNETWORK_MIXMECH  空气混合机械通风-空间-空间*/
+	String CONVECTIONNETWORK_MIXMECH = "ConvectionNetwork_MixMech";
+
+	/** CONVECTIONNETWORK_NATURAL  空气自然对流-空间-空间*/
+	String CONVECTIONNETWORK_NATURAL = "ConvectionNetwork_Natural";
+	
+	/** CONVECTIONNETWORK_ONEWAYMECH  空气单向机械通风-空间→空间*/
+	String CONVECTIONNETWORK_ONEWAYMECH = "ConvectionNetwork_OnewayMech";
+	
+	
+	
+	/** SENSORRELATIONSHIP_SS2EQ  传感器测量设备关系-传感器→被测设备*/
+	String SENSORRELATIONSHIP_SS2EQ = "SensorRelationship_Ss2Eq";
+	
+	/** SENSORRELATIONSHIP_SS2SP  传感器测量空间关系-传感器→被测空间*/
+	String SENSORRELATIONSHIP_SS2SP = "SensorRelationship_Ss2Sp";
+	
+	/** SENSORRELATIONSHIP_SS2SY  传感器测量系统关系-传感器→被测系统*/
+	String SENSORRELATIONSHIP_SS2SY = "SensorRelationship_Ss2Sy";
 	
 }

+ 1 - 1
src/main/java/com/persagy/proxy/adm/controller/ComponentBuildingController.java

@@ -65,7 +65,7 @@ public class ComponentBuildingController {
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
-		List<ObjectDigital> masterObjs = this.relationObjectContext.queryPageObjectInfo(requestData, groupCode, projectId, AdmRelationType.BD2FL_ARCHSUBSET);
+		List<ObjectDigital> masterObjs = this.relationObjectContext.queryPageObjectInfo(requestData, groupCode, projectId, AdmRelationType.ARCHSUBSET_BD2FL);
 		this.handleMasterObjs(masterObjs, groupCode, projectId);
 		return AdmResponse.success();
 	}

+ 36 - 0
src/main/java/com/persagy/proxy/adm/controller/RelationReportController.java

@@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.model.AdmRelationObject;
+import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IRelationReportService;
 import com.persagy.proxy.adm.strategy.RelationObjectContext;
@@ -59,6 +60,25 @@ public class RelationReportController {
 	@Autowired
 	private IRelationReportService relationReportService;
 	
+	
+	/**
+	 * 查询总数量
+	 * 
+	 * @param queryCriteria
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("/graphic/query-count")
+	public AdmResponse queryCount(HttpServletRequest request) {
+		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
+		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
+		// 获取此项目下所有的图类型
+		
+		JSONObject result = new JSONObject();
+		result.put("count", 0);
+		return AdmResponse.success(Lists.newArrayList(result));
+	}
+	
 	/**
 	 * 查询总览数量-根据类型查询关系数量
 	 * 
@@ -75,6 +95,22 @@ public class RelationReportController {
 		return AdmResponse.success(Lists.newArrayList(result));
 	}
 	
+	/**
+	 * 项目关系类型查询
+	 * 
+	 * @param queryCriteria
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("/graphic/relation_type_project")
+	public AdmResponse queryRelationObjects(@RequestParam AdmQueryCriteria queryCriteria, HttpServletRequest request) {
+		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
+		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
+		JSONObject result = new JSONObject();
+		result.put("count", 0);
+		return AdmResponse.success(Lists.newArrayList(result));
+	}
+	
 	
 	/**
 	 * 下载报告-设备静态信息维护模板

+ 4 - 3
src/main/java/com/persagy/proxy/adm/service/impl/RelationReportService.java

@@ -15,7 +15,8 @@ import com.persagy.dmp.digital.client.DigitalObjectFacade;
 import com.persagy.dmp.digital.client.DigitalRelationFacade;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.proxy.adm.constant.AdmRelationType;
+import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 import com.persagy.proxy.adm.strategy.RelationObjectContext;
@@ -124,8 +125,8 @@ public class RelationReportService implements IRelationReportService {
 	@Override
 	public List<AdmRelationObject> reportRelationObject(String groupCode, String projectId, String relType, String code, String zoneType) {
 		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		if (AdmRelationType.EQ2SP_SENSORRELATIONSHIP_SS2SP.equals(relType)){
-			relType = AdmRelationType.EQ2SP;
+		if (AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP.getRelationType().equals(relType)){
+			relType = RelCodeEnum.Eq2Sp.name();
         }
 		log.info("下载报表: groupCode[{}], projectId[{}], relType[{}], code[{}]", groupCode, projectId, relType, code);
 		return this.relationObjectContext.findRelationObject(groupCode, projectId, relType);

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

@@ -12,6 +12,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.proxy.adm.constant.AdmCommonConstant;
+import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.strategy.relationdata.RelationObjectStrategy;
 
@@ -50,7 +52,12 @@ public class RelationObjectContext {
 	 * @return
 	 */
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId, String relType) {
-		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(relType);
+		AdmRelationTypeEnum relationTypeEnum = AdmCommonConstant.RELATION_TYPE_MAP.get(relType);
+		if (relationTypeEnum == null) {
+			return Lists.newArrayList();
+		}
+		String className = relationTypeEnum.getGraphCode() + AdmCommonConstant.UNDERLINE + relationTypeEnum.getRelationType();
+		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(className);
 		return strategy == null ? Lists.newArrayList() : strategy.findRelationObject(groupCode, projectId);
 	}
 	
@@ -63,7 +70,12 @@ public class RelationObjectContext {
 	 * @return String - 校验失败的原因, ObjectNode -- BDTP接口的参数,不会返回null,请用instanceOf 判断返回值
 	 */
 	public Object checkRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String relType, String code) {
-		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(relType);
+		AdmRelationTypeEnum relationTypeEnum = AdmCommonConstant.RELATION_TYPE_MAP.get(relType);
+		if (relationTypeEnum == null) {
+			return "未知类型";
+		}
+		String className = relationTypeEnum.getGraphCode() + AdmCommonConstant.UNDERLINE + relationTypeEnum.getRelationType();
+		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(className);
 		if (strategy == null) {
 			return "不存在此策略类";
 		}
@@ -81,7 +93,12 @@ public class RelationObjectContext {
 	 * @return 
 	 */
 	public boolean saveRelationObjects(List<ObjectNode> relationObjects, String groupCode, String projectId, String relType) {
-		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(relType);
+		AdmRelationTypeEnum relationTypeEnum = AdmCommonConstant.RELATION_TYPE_MAP.get(relType);
+		if (relationTypeEnum == null) {
+			return false;
+		}
+		String className = relationTypeEnum.getGraphCode() + AdmCommonConstant.UNDERLINE + relationTypeEnum.getRelationType();
+		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(className);
 		if (strategy == null) {
 			return false;
 		}
@@ -98,7 +115,12 @@ public class RelationObjectContext {
 	 * @return 
 	 */
 	public long countRelationObjects(String groupCode, String projectId, String relType) {
-		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(relType);
+		AdmRelationTypeEnum relationTypeEnum = AdmCommonConstant.RELATION_TYPE_MAP.get(relType);
+		if (relationTypeEnum == null) {
+			return 0;
+		}
+		String className = relationTypeEnum.getGraphCode() + AdmCommonConstant.UNDERLINE + relationTypeEnum.getRelationType();
+		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(className);
 		if (strategy == null) {
 			return 0;
 		}
@@ -117,7 +139,12 @@ public class RelationObjectContext {
 	 */
 	public List<ObjectDigital> queryPageObjectInfo(RequestData requestData, String groupCode, String projectId, String relType) {
 		List<ObjectDigital> masterObjs = new ArrayList<ObjectDigital>();
-		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(relType);
+		AdmRelationTypeEnum relationTypeEnum = AdmCommonConstant.RELATION_TYPE_MAP.get(relType);
+		if (relationTypeEnum == null) {
+			return masterObjs;
+		}
+		String className = relationTypeEnum.getGraphCode() + AdmCommonConstant.UNDERLINE + relationTypeEnum.getRelationType();
+		RelationObjectStrategy strategy = this.relationObjectStrategyMap.get(className);
 		if (strategy == null) {
 			return masterObjs;
 		}

+ 9 - 7
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2BdForRelationObject.java

@@ -14,6 +14,8 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
@@ -24,10 +26,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SH2BD_ARCHFORARCH)
-public class Sh2BdForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.ARCHFORARCH_SH2BD)
+public class ArchForArchSh2BdRelationObject extends AbstractReportRelationObject {
 
-	public Sh2BdForRelationObject(IRelationReportService relationReportService) {
+	public ArchForArchSh2BdRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -35,8 +37,8 @@ public class Sh2BdForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SH2BD_ARCHFORARCH.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SH2BD_ARCHFORARCH.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sh2Bd.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -47,8 +49,8 @@ public class Sh2BdForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SH2BD_ARCHFORARCH.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SH2BD_ARCHFORARCH.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sh2Bd.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		

+ 9 - 8
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2FlForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -25,10 +26,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SH2FL_ARCHFORARCH)
-public class Sh2FlForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.ARCHFORARCH_SH2FL)
+public class ArchForArchSh2FlRelationObject extends AbstractReportRelationObject {
 
-	public Sh2FlForRelationObject(IRelationReportService relationReportService) {
+	public ArchForArchSh2FlRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -36,8 +37,8 @@ public class Sh2FlForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SH2FL_ARCHFORARCH.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SH2FL_ARCHFORARCH.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sh2Fl.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -48,8 +49,8 @@ public class Sh2FlForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SH2FL_ARCHFORARCH.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SH2FL_ARCHFORARCH.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sh2Fl.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
@@ -59,7 +60,7 @@ public class Sh2FlForRelationObject extends AbstractReportRelationObject {
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
 		// 获取建筑的信息
-		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.SH2FL_ARCHFORARCH.getGraphCode(), 
+		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.ArchForArch.name(), 
 				RelCodeEnum.Sh2Bd.name(), master.getId(), null);
 
 		AdmRelationObject convertObject = this.convertObject(master, "竖井", slave, "楼层");

+ 9 - 7
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2ShForRelationObject.java

@@ -14,6 +14,8 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
@@ -24,10 +26,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SH2SH_ARCHFORARCH)
-public class Sh2ShForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.ARCHFORARCH_SH2SH)
+public class ArchForArchSh2ShRelationObject extends AbstractReportRelationObject {
 
-	public Sh2ShForRelationObject(IRelationReportService relationReportService) {
+	public ArchForArchSh2ShRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 	
@@ -35,8 +37,8 @@ public class Sh2ShForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SH2SH_ARCHFORARCH.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SH2SH_ARCHFORARCH.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sh2Sh.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -47,8 +49,8 @@ public class Sh2ShForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SH2SH_ARCHFORARCH.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SH2SH_ARCHFORARCH.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sh2Sh.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		

+ 10 - 9
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2SpForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -27,10 +28,10 @@ import cn.hutool.core.util.StrUtil;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SH2SP_ARCHFORARCH)
-public class Sh2SpForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.ARCHFORARCH_SH2SP)
+public class ArchForArchSh2SpRelationObject extends AbstractReportRelationObject {
 
-	public Sh2SpForRelationObject(IRelationReportService relationReportService) {
+	public ArchForArchSh2SpRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -38,8 +39,8 @@ public class Sh2SpForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SH2SP_ARCHFORARCH.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SH2SP_ARCHFORARCH.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sh2Sp.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -50,8 +51,8 @@ public class Sh2SpForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SH2SP_ARCHFORARCH.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SH2SP_ARCHFORARCH.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sh2Sp.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
@@ -61,9 +62,9 @@ public class Sh2SpForRelationObject extends AbstractReportRelationObject {
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
 		// 获取建筑的信息
-		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.SH2SP_ARCHFORARCH.getGraphCode(), 
+		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.ArchForArch.name(), 
 				RelCodeEnum.Sh2Fl.name(), master.getId(), null);
-		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.SH2SP_ARCHFORARCH.getGraphCode(), 
+		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.ArchForArch.name(), 
 				RelCodeEnum.Sh2Bd.name(), master.getId(), null);
 		
 		AdmRelationObject convertObject = this.convertObject(master, "竖井", slave, "空间");

+ 9 - 8
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2BdForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -27,10 +28,10 @@ import cn.hutool.core.util.StrUtil;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2BD_ARCHFORARCH)
-public class Sp2BdForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.ARCHFORARCH_SP2BD)
+public class ArchForArchSp2BdRelationObject extends AbstractReportRelationObject {
 
-	public Sp2BdForRelationObject(IRelationReportService relationReportService) {
+	public ArchForArchSp2BdRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 	
@@ -38,8 +39,8 @@ public class Sp2BdForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SP2BD_ARCHFORARCH.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SP2BD_ARCHFORARCH.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sp2Bd.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -50,8 +51,8 @@ public class Sp2BdForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SP2BD_ARCHFORARCH.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SP2BD_ARCHFORARCH.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sp2Bd.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
@@ -61,7 +62,7 @@ public class Sp2BdForRelationObject extends AbstractReportRelationObject {
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
 		// 获取楼层的信息
-		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.SP2BD_ARCHFORARCH.getGraphCode(), 
+		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.ArchForArch.name(), 
 				RelCodeEnum.Sp2Fl.name(), master.getId(), null);
 		
 		AdmRelationObject convertObject = this.convertObject(master, "空间", slave, "建筑");

+ 9 - 8
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2FlForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -27,10 +28,10 @@ import cn.hutool.core.util.StrUtil;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2FL_ARCHFORARCH)
-public class Sp2FlForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.ARCHFORARCH_SP2FL)
+public class ArchForArchSp2FlRelationObject extends AbstractReportRelationObject {
 
-	public Sp2FlForRelationObject(IRelationReportService relationReportService) {
+	public ArchForArchSp2FlRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -38,8 +39,8 @@ public class Sp2FlForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SP2FL_ARCHFORARCH.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SP2FL_ARCHFORARCH.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sp2Fl.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -50,8 +51,8 @@ public class Sp2FlForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SP2FL_ARCHFORARCH.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SP2FL_ARCHFORARCH.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.ArchForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sp2Fl.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
@@ -61,7 +62,7 @@ public class Sp2FlForRelationObject extends AbstractReportRelationObject {
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
 		// 获取建筑的信息
-		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.SP2FL_ARCHFORARCH.getGraphCode(), 
+		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.ArchForArch.name(), 
 				RelCodeEnum.Sp2Bd.name(), master.getId(), null);
 		
 		AdmRelationObject convertObject = this.convertObject(master, "空间", slave, "楼层");

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Bd2FlSubRelationObject.java

@@ -22,10 +22,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月9日 下午5:28:21
  */
-@Component(value = AdmRelationType.BD2FL_ARCHSUBSET)
-public class Bd2FlSubRelationObject extends AbstractRelationObject {
+@Component(value = AdmRelationType.ARCHSUBSET_BD2FL)
+public class ArchSubsetBd2FlRelationObject extends AbstractRelationObject {
 
-	public Bd2FlSubRelationObject(IRelationReportService reportDownloadService) {
+	public ArchSubsetBd2FlRelationObject(IRelationReportService reportDownloadService) {
 		super(reportDownloadService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpMixMechRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2SP_CONVECTIONNETWORK_2)
-public class Sp2SpMixMechRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.CONVECTIONNETWORK_MIXMECH)
+public class ConvectionNetworkMixMechRelationObject extends AbstractReportRelationObject {
 	
-	public Sp2SpMixMechRelationObject(IRelationReportService relationReportService) {
+	public ConvectionNetworkMixMechRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpNaturalRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2SP_CONVECTIONNETWORK_1)
-public class Sp2SpNaturalRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.CONVECTIONNETWORK_NATURAL)
+public class ConvectionNetworkNaturalRelationObject extends AbstractReportRelationObject {
 	
-	public Sp2SpNaturalRelationObject(IRelationReportService relationReportService) {
+	public ConvectionNetworkNaturalRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpOnewayMechRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2SP_CONVECTIONNETWORK_3)
-public class Sp2SpOnewayMechRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.CONVECTIONNETWORK_ONEWAYMECH)
+public class ConvectionNetworkOnewayMechRelationObject extends AbstractReportRelationObject {
 	
-	public Sp2SpOnewayMechRelationObject(IRelationReportService relationReportService) {
+	public ConvectionNetworkOnewayMechRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqEqBackupRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2EQ_EQUIPPOWER_2)
-public class Eq2EqEqBackupRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.EQUIPPOWER_EQBACKUP)
+public class EquipPowerEqBackupRelationObject extends AbstractReportRelationObject {
 	
-	public Eq2EqEqBackupRelationObject(IRelationReportService relationReportService) {
+	public EquipPowerEqBackupRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqEqNormalRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2EQ_EQUIPPOWER_1)
-public class Eq2EqEqNormalRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.EQUIPPOWER_EQNORMAL)
+public class EquipPowerEqNormalRelationObject extends AbstractReportRelationObject {
 	
-	public Eq2EqEqNormalRelationObject(IRelationReportService relationReportService) {
+	public EquipPowerEqNormalRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqSyBackupRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2EQ_EQUIPPOWER_4)
-public class Eq2EqSyBackupRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.EQUIPPOWER_SYBACKUP)
+public class EquipPowerSyBackupRelationObject extends AbstractReportRelationObject {
 	
-	public Eq2EqSyBackupRelationObject(IRelationReportService relationReportService) {
+	public EquipPowerSyBackupRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 	

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqSyNormalRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2EQ_EQUIPPOWER_3)
-public class Eq2EqSyNormalRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.EQUIPPOWER_SYNORMAL)
+public class EquipPowerSyNormalRelationObject extends AbstractReportRelationObject {
 	
-	public Eq2EqSyNormalRelationObject(IRelationReportService relationReportService) {
+	public EquipPowerSyNormalRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 6 - 5
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2BdForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -27,10 +28,10 @@ import cn.hutool.core.util.StrUtil;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2BD_FOR)
-public class Eq2BdForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHFORARCH_EQ2BD)
+public class MechForArchEq2BdRelationObject extends AbstractReportRelationObject {
 
-	public Eq2BdForRelationObject(IRelationReportService relationReportService) {
+	public MechForArchEq2BdRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 	
@@ -38,8 +39,8 @@ public class Eq2BdForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2BD_FOR.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.EQ2BD_FOR.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Eq2Bd.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 9 - 8
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2FlForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -27,10 +28,10 @@ import cn.hutool.core.util.StrUtil;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2FL_FOR)
-public class Eq2FlForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHFORARCH_EQ2FL)
+public class MechForArchEq2FlRelationObject extends AbstractReportRelationObject {
 
-	public Eq2FlForRelationObject(IRelationReportService relationReportService) {
+	public MechForArchEq2FlRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -38,8 +39,8 @@ public class Eq2FlForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2FL_FOR.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.EQ2FL_FOR.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Eq2Fl.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -50,8 +51,8 @@ public class Eq2FlForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.EQ2FL_FOR.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.EQ2FL_FOR.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
+		requestData.setRelCode(RelCodeEnum.Eq2Fl.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
@@ -61,7 +62,7 @@ public class Eq2FlForRelationObject extends AbstractReportRelationObject {
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
 		// 获取建筑信息
-		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.EQ2FL_FOR.getGraphCode(), 
+		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.MechForArch.name(), 
 				RelCodeEnum.Eq2Bd.name(), master.getId(), null);
 		
 		AdmRelationObject convertObject = this.convertObject(master, "设备", slave, "楼层");

+ 10 - 9
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2ShForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -27,10 +28,10 @@ import cn.hutool.core.util.StrUtil;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2SH_FOR)
-public class Eq2ShForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHFORARCH_EQ2SH)
+public class MechForArchEq2ShRelationObject extends AbstractReportRelationObject {
 
-	public Eq2ShForRelationObject(IRelationReportService relationReportService) {
+	public MechForArchEq2ShRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -38,8 +39,8 @@ public class Eq2ShForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2SH_FOR.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.EQ2SH_FOR.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Eq2Sh.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -50,8 +51,8 @@ public class Eq2ShForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.EQ2SH_FOR.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.EQ2SH_FOR.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
+		requestData.setRelCode(RelCodeEnum.Eq2Sh.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
@@ -61,9 +62,9 @@ public class Eq2ShForRelationObject extends AbstractReportRelationObject {
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
 		// 获取楼层信息
-		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.EQ2SH_FOR.getGraphCode(), 
+		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.MechForArch.name(), 
 				RelCodeEnum.Eq2Fl.name(), master.getId(), null);
-		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.EQ2SH_FOR.getGraphCode(), 
+		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.MechForArch.name(), 
 				RelCodeEnum.Eq2Bd.name(), master.getId(), null);
 		
 		AdmRelationObject convertObject = this.convertObject(master, "设备", slave, "竖井");

+ 9 - 7
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2BdForRelationObject.java

@@ -14,6 +14,8 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
@@ -24,10 +26,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SY2BD_FOR)
-public class Sy2BdForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHFORARCH_SY2BD)
+public class MechForArchSy2BdRelationObject extends AbstractReportRelationObject {
 
-	public Sy2BdForRelationObject(IRelationReportService relationReportService) {
+	public MechForArchSy2BdRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 	
@@ -35,8 +37,8 @@ public class Sy2BdForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SY2BD_FOR.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SY2BD_FOR.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sy2Bd.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -47,8 +49,8 @@ public class Sy2BdForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SY2BD_FOR.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SY2BD_FOR.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sy2Bd.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		

+ 8 - 7
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2FlForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -25,10 +26,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SY2FL_FOR)
-public class Sy2FlForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHFORARCH_SY2FL)
+public class MechForArchSy2FlRelationObject extends AbstractReportRelationObject {
 
-	public Sy2FlForRelationObject(IRelationReportService relationReportService) {
+	public MechForArchSy2FlRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -36,8 +37,8 @@ public class Sy2FlForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SY2FL_FOR.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SY2FL_FOR.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sy2Fl.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -48,8 +49,8 @@ public class Sy2FlForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SY2FL_FOR.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SY2FL_FOR.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sy2Fl.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		

+ 9 - 7
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2ShForRelationObject.java

@@ -14,6 +14,8 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
@@ -24,10 +26,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SY2SH_FOR)
-public class Sy2ShForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHFORARCH_SY2SH)
+public class MechForArchSy2ShRelationObject extends AbstractReportRelationObject {
 
-	public Sy2ShForRelationObject(IRelationReportService relationReportService) {
+	public MechForArchSy2ShRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 	
@@ -35,8 +37,8 @@ public class Sy2ShForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SY2SH_FOR.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SY2SH_FOR.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sy2Sh.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -47,8 +49,8 @@ public class Sy2ShForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SY2SH_FOR.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SY2SH_FOR.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sy2Sh.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		

+ 10 - 9
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2SpForRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -27,10 +28,10 @@ import cn.hutool.core.util.StrUtil;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SY2SP_FOR)
-public class Sy2SpForRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHFORARCH_SY2SP)
+public class MechForArchSy2SpRelationObject extends AbstractReportRelationObject {
 
-	public Sy2SpForRelationObject(IRelationReportService relationReportService) {
+	public MechForArchSy2SpRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -38,8 +39,8 @@ public class Sy2SpForRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.SY2SP_FOR.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.SY2SP_FOR.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
+		objectNode.put("relCode", RelCodeEnum.Sy2Sp.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -50,8 +51,8 @@ public class Sy2SpForRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.SY2SP_FOR.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.SY2SP_FOR.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechForArch.name());
+		requestData.setRelCode(RelCodeEnum.Sy2Sp.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
@@ -61,9 +62,9 @@ public class Sy2SpForRelationObject extends AbstractReportRelationObject {
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
 		// 获取楼层信息
-		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.SY2SP_FOR.getGraphCode(), 
+		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.MechForArch.name(), 
 				RelCodeEnum.Sy2Bd.name(), master.getId(), null);
-		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.SY2SP_FOR.getGraphCode(), 
+		ObjectNode buildingInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.MechForArch.name(), 
 				RelCodeEnum.Sy2Fl.name(), master.getId(), null);
 		
 		AdmRelationObject convertObject = this.convertObject(master, "系统", slave, "空间");

+ 9 - 8
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2BdRelationObject.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -25,10 +26,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2BD)
-public class Eq2BdRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHINARCH_EQ2BD)
+public class MechInArchEq2BdRelationObject extends AbstractReportRelationObject {
 
-	public Eq2BdRelationObject(IRelationReportService relationReportService) {
+	public MechInArchEq2BdRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 	
@@ -36,8 +37,8 @@ public class Eq2BdRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2BD.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.EQ2BD.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechInArch.name());
+		objectNode.put("relCode", RelCodeEnum.Eq2Bd.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -48,8 +49,8 @@ public class Eq2BdRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.EQ2BD.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.EQ2BD.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechInArch.name());
+		requestData.setRelCode(RelCodeEnum.Eq2Bd.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		
@@ -59,7 +60,7 @@ public class Eq2BdRelationObject extends AbstractReportRelationObject {
 	@Override
 	protected AdmRelationObject handleObjectDigital(ObjectDigital master, ObjectDigital slave, String groupCode, String projectId) {
 		// 获取楼层信息
-		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, AdmRelationTypeEnum.EQ2BD.getGraphCode(), 
+		ObjectNode floorInfo = this.relationReportService.getObjectByCodeAndId(groupCode, projectId, GraphCodeEnum.MechInArch.name(), 
 				RelCodeEnum.Eq2Fl.name(), master.getId(), null);
 		
 		AdmRelationObject convertObject = this.convertObject(master, "设备", slave, "建筑");

+ 9 - 7
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2FlRelationObject.java

@@ -14,6 +14,8 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
@@ -24,10 +26,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2FL)
-public class Eq2FlRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHINARCH_EQ2FL)
+public class MechInArchEq2FlRelationObject extends AbstractReportRelationObject {
 
-	public Eq2FlRelationObject(IRelationReportService relationReportService) {
+	public MechInArchEq2FlRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -35,8 +37,8 @@ public class Eq2FlRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2FL.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.EQ2FL.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechInArch.name());
+		objectNode.put("relCode", RelCodeEnum.Eq2Fl.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -47,8 +49,8 @@ public class Eq2FlRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.EQ2FL.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.EQ2FL.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechInArch.name());
+		requestData.setRelCode(RelCodeEnum.Eq2Fl.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		

+ 9 - 8
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2SpRelationObject.java

@@ -14,21 +14,22 @@ import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
 /**
- * 此类型需转为 AdmRelationTypeEnum.EQ2SP_IN 进行数据查询
  * 
  * @version 1.0.0
  * @company persagy 
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2SP)
-public class Eq2SpRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.MECHINARCH_EQ2SP)
+public class MechInArchEq2SpRelationObject extends AbstractReportRelationObject {
 
-	public Eq2SpRelationObject(IRelationReportService relationReportService) {
+	public MechInArchEq2SpRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 
@@ -36,8 +37,8 @@ public class Eq2SpRelationObject extends AbstractReportRelationObject {
 	public long countRelationObjects(String groupCode, String projectId) {
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
-		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2SP_IN.getGraphCode());
-		objectNode.put("relCode", AdmRelationTypeEnum.EQ2SP_IN.getRelCode());
+		objectNode.put("graphCode", GraphCodeEnum.MechInArch.name());
+		objectNode.put("relCode", RelCodeEnum.Eq2Sp.name());
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		
@@ -48,8 +49,8 @@ public class Eq2SpRelationObject extends AbstractReportRelationObject {
 	@Override
 	public List<AdmRelationObject> findRelationObject(String groupCode, String projectId) {
 		RequestData requestData = new RequestData();
-		requestData.setGraphCode(AdmRelationTypeEnum.EQ2SP_IN.getGraphCode());
-		requestData.setRelCode(AdmRelationTypeEnum.EQ2SP_IN.getRelCode());
+		requestData.setGraphCode(GraphCodeEnum.MechInArch.name());
+		requestData.setRelCode(RelCodeEnum.Eq2Sp.name());
 		requestData.setPage(1L);
 		requestData.setSize(1000L);
 		

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpTransparentRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2SP_RADIATIONNETWORK_1)
-public class Sp2SpTransparentRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.RADIATIONNETWORK_CONNECT)
+public class RadiationNetworkConnectRelationObject extends AbstractReportRelationObject {
 	
-	public Sp2SpTransparentRelationObject(IRelationReportService relationReportService) {
+	public RadiationNetworkConnectRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpConnectRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2SP_RADIATIONNETWORK_2)
-public class Sp2SpConnectRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.RADIATIONNETWORK_TRANSPARENT)
+public class RadiationNetworkTransparentRelationObject extends AbstractReportRelationObject {
 	
-	public Sp2SpConnectRelationObject(IRelationReportService relationReportService) {
+	public RadiationNetworkTransparentRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2EqShipRelationObject.java

@@ -18,17 +18,16 @@ import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
 /**
- * 图类型编码 -- SensorRelationship
  * 
  * @version 1.0.0
  * @company persagy
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2EQ_SENSORRELATIONSHIP_SS2EQ)
-public class Ss2EqShipRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.SENSORRELATIONSHIP_SS2EQ)
+public class SensorRelationshipSs2EqRelationObject extends AbstractReportRelationObject {
 	
-	public Ss2EqShipRelationObject(IRelationReportService relationReportService) {
+	public SensorRelationshipSs2EqRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2SpShipRelationObject.java

@@ -25,10 +25,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2SP_SENSORRELATIONSHIP_SS2SP)
-public class Ss2SpShipRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.SENSORRELATIONSHIP_SS2SP)
+public class SensorRelationshipSs2SpRelationObject extends AbstractReportRelationObject {
 	
-	public Ss2SpShipRelationObject(IRelationReportService relationReportService) {
+	public SensorRelationshipSs2SpRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 	

+ 3 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2SyShipRelationObject.java

@@ -18,17 +18,16 @@ import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.service.IRelationReportService;
 
 /**
- * 图类型编码 -- SensorRelationship
  * 
  * @version 1.0.0
  * @company persagy
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.EQ2SY_SENSORRELATIONSHIP_SS2SY)
-public class Ss2SyShipRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.SENSORRELATIONSHIP_SS2SY)
+public class SensorRelationshipSs2SyRelationObject extends AbstractReportRelationObject {
 	
-	public Ss2SyShipRelationObject(IRelationReportService relationReportService) {
+	public SensorRelationshipSs2SyRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpFFCloseRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2SP_TRAFFICNETWORK_3)
-public class Sp2SpFFCloseRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.TRAFFICNETWORK_FFCLOSE)
+public class TrafficNetworkFFCloseRelationObject extends AbstractReportRelationObject {
 	
-	public Sp2SpFFCloseRelationObject(IRelationReportService relationReportService) {
+	public TrafficNetworkFFCloseRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpFFOpenRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2SP_TRAFFICNETWORK_2)
-public class Sp2SpFFOpenRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.TRAFFICNETWORK_FFOPEN)
+public class TrafficNetworkFFOpenRelationObject extends AbstractReportRelationObject {
 	
-	public Sp2SpFFOpenRelationObject(IRelationReportService relationReportService) {
+	public TrafficNetworkFFOpenRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}
 

+ 3 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpNormalRelationObject.java

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.service.IRelationReportService;
  * @author zhangqiankun
  * @date 2021年9月3日 上午9:42:46
  */
-@Component(value = AdmRelationType.SP2SP_TRAFFICNETWORK_1)
-public class Sp2SpNormalRelationObject extends AbstractReportRelationObject {
+@Component(value = AdmRelationType.TRAFFICNETWORK_NORMAL)
+public class TrafficNetworkNormalRelationObject extends AbstractReportRelationObject {
 	
-	public Sp2SpNormalRelationObject(IRelationReportService relationReportService) {
+	public TrafficNetworkNormalRelationObject(IRelationReportService relationReportService) {
 		super(relationReportService);
 	}