Browse Source

抽取公共类

lijie 3 years ago
parent
commit
9ff2ca7500
33 changed files with 55 additions and 139 deletions
  1. 0 4
      adm-business/adm-middleware/pom.xml
  2. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/handler/RelationReportHandler.java
  3. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/handler/SpaceRelationInfoHandler.java
  4. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java
  5. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2FlRelationObject.java
  6. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2ShRelationObject.java
  7. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2SpRelationObject.java
  8. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2BdRelationObject.java
  9. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2FlRelationObject.java
  10. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2SpRelationObject.java
  11. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchSubsetBd2FlRelationObject.java
  12. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2BdRelationObject.java
  13. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2FlRelationObject.java
  14. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2ShRelationObject.java
  15. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2BdRelationObject.java
  16. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2FlRelationObject.java
  17. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2ShRelationObject.java
  18. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2SpRelationObject.java
  19. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2BdRelationObject.java
  20. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2FlRelationObject.java
  21. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2SpRelationObject.java
  22. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmComponentController.java
  23. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmComponentServiceImpl.java
  24. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmFloorServiceImpl.java
  25. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmShaftServiceImpl.java
  26. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmSpaceServiceImpl.java
  27. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmSystemServiceImpl.java
  28. 0 5
      adm-business/adm-server/pom.xml
  29. 2 4
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelServiceImpl.java
  30. 0 15
      adm-common/pom.xml
  31. 0 21
      adm-common/src/main/java/com/persagy/adm/common/constant/GraphCodeEnum.java
  32. 0 24
      adm-common/src/main/java/com/persagy/adm/common/constant/RelCodeEnum.java
  33. 1 14
      pom.xml

+ 0 - 4
adm-business/adm-middleware/pom.xml

@@ -11,10 +11,6 @@
     <artifactId>adm-middleware</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>adm-common</artifactId>
-        </dependency>
         <!-- 配置中心(包含注册中心) -->
         <dependency>
             <groupId>com.persagy</groupId>

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/handler/RelationReportHandler.java

@@ -6,8 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.digital.entity.ObjectDigital;

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/handler/SpaceRelationInfoHandler.java

@@ -8,8 +8,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.digital.entity.ObjectDigital;

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java

@@ -3,9 +3,9 @@ package com.persagy.proxy.adm.strategy.relationdata;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.helper.SpringHelper;

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2FlRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2ShRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2SpRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2BdRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2FlRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2SpRelationObject.java

@@ -3,9 +3,9 @@ package com.persagy.proxy.adm.strategy.relationdata;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.helper.SpringHelper;

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchSubsetBd2FlRelationObject.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2BdRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2FlRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2ShRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2BdRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2FlRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2ShRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2SpRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2BdRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2FlRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2SpRelationObject.java

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmComponentController.java

@@ -6,9 +6,9 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.constant.CommonConstant;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.digital.client.DigitalRelationFacade;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;

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

@@ -3,9 +3,9 @@ package com.persagy.proxy.object.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;
 import com.persagy.proxy.common.entity.InstanceUrlParam;

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

@@ -8,10 +8,10 @@ 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.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.constant.CommonConstant;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.response.CommonResult;

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

@@ -3,9 +3,9 @@ package com.persagy.proxy.object.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;

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

@@ -14,11 +14,11 @@ 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.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.dmp.common.constant.CommonConstant;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.response.CommonResult;

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

@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;

+ 0 - 5
adm-business/adm-server/pom.xml

@@ -8,14 +8,9 @@
         <artifactId>adm-business</artifactId>
         <version>1.0.0</version>
     </parent>
-    <groupId>com.persagy</groupId>
     <artifactId>adm-server</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>adm-common</artifactId>
-        </dependency>
         <!-- 配置中心(包含注册中心) -->
         <dependency>
             <groupId>com.persagy</groupId>

+ 2 - 4
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelServiceImpl.java

@@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.adm.common.constant.GraphCodeEnum;
-import com.persagy.adm.common.constant.RelCodeEnum;
 import com.persagy.adm.server.algorithm.constant.AdmServerConstant;
 import com.persagy.adm.server.algorithm.dao.AdmModelFileMapper;
-import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
 import com.persagy.adm.server.algorithm.entity.AdmModelFile;
 import com.persagy.adm.server.algorithm.service.AdmModelService;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.constant.CommonConstant;
+import com.persagy.dmp.common.constant.GraphCodeEnum;
+import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.helper.SpringHelper;
@@ -27,7 +26,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

+ 0 - 15
adm-common/pom.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>adm</artifactId>
-        <groupId>com.persagy</groupId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>adm-common</artifactId>
-
-
-</project>

+ 0 - 21
adm-common/src/main/java/com/persagy/adm/common/constant/GraphCodeEnum.java

@@ -1,21 +0,0 @@
-package com.persagy.adm.common.constant;
-
-/**
- * 图类型编码
- * 
- * @version 1.0.0
- * @company persagy 
- * @author zhangqiankun
- * @date 2021年9月2日 下午4:31:27
- */
-
-public enum GraphCodeEnum {
-
-	ArchSubset,SpaceNeighborhood,ThroughRelationship,TrafficNetwork,ConvectionNetwork,
-	RadiationNetwork,SpaceCorrespond,ArchForArch,MechInArch,MechForArch,MechSubset,LUDistribution,
-	HUDistribution,ChillWaterLoop,CoolingWaterLoop,HeatWaterLoop,CondWaterNetwork,ACAirNetwork,FreshAirNetwork,
-	VentNetwork,VRFNetwork,DomesticWaterNetwork,DrainingWaterNetwork,RecycleWaterNetwork,DrinkingWaterNetwork,DHWNetwork,
-	GasNetwork,FireWaterNetwork,FireVentNetwork,WENetwork,MechCtrl,MechPower,SensorRelationship,ValveRelationship,
-	EnergySubMeter,ScheduleRelationship,MeteorologyRelationship,TenentInArch,BlocRelationship,Property2Mech,PropertyInArch,
-	
-}

+ 0 - 24
adm-common/src/main/java/com/persagy/adm/common/constant/RelCodeEnum.java

@@ -1,24 +0,0 @@
-package com.persagy.adm.common.constant;
-
-/**
- * 边类型编码
- * 
- * @version 1.0.0
- * @company persagy 
- * @author zhangqiankun
- * @date 2021年9月2日 下午4:32:28
- */
-public enum RelCodeEnum {
-	Pj2Bd,Bd2Fl,
-	None,Door,Window,DoorWindow,
-	FFOpen,FFClose,
-	Natural,OnewayMech,MixMech,Connect,Transparent,
-	Fl2Bd,Fl2Fl,Fl2Sh,Fl2Sp,Sh2Bd,Sh2Fl,Sh2Sh,Sh2Sp,Sp2Bd,
-	ExactCorrespond,InexactCorrespond,Bd2Bd,Bd2Sh,Bd2Sp,
-	Sp2Fl,Sp2Sh,Sp2Sp,
-	Sy2Bd,Sy2Fl,Sy2Sh,Sy2Sp,Eq2Bd,Eq2Fl,Eq2Sh,Eq2Sp,Pj2Sy,Pj2Eq,Sy2Eq,Eq2Ec,
-	Backup,Fill,Return,Fresh,
-	Uncertain,SupplyReturn,Supply,Bypass,Discharge,Normal,SyCtrl,EqCtrl,SyNormal,
-	SyBackup,EqNormal,EqBackup,Ss2Eq,Ss2Sy,Ss2Sp,Vv2Eq,Vv2Sy,Vv2Vv,Em2Bd,Sub2Em,SubTree,Br2Sub,
-	Br2Eq,Sch2Pj,Sch2Bd,Sch2Fl,Sch2Sp,Sch2Tn,Ms2Pj,Tn2Sp,Bl2Pj,Pe2Eq,Pe2Ec,Pe2Pj,Pe2Bd,Pe2Fl,Pe2Sh,Pe2Sp;
-}

+ 1 - 14
pom.xml

@@ -14,19 +14,6 @@
 
     <modules>
         <module>adm-business</module>
-        <module>adm-common</module>
     </modules>
-    <!-- 版本管理 -->
-    <properties>
-        <adm.version>1.0.0</adm.version>
-    </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.persagy</groupId>
-                <artifactId>adm-common</artifactId>
-                <version>${adm.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+
 </project>