Quellcode durchsuchen

需求:实现查询模型文件列表及添加模型文件的接口逻辑

lijie vor 3 Jahren
Ursprung
Commit
9e3f261fd8
52 geänderte Dateien mit 395 neuen und 86 gelöschten Zeilen
  1. 4 1
      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. 0 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/AbstractReportRelationObject.java
  5. 3 0
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java
  6. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2FlRelationObject.java
  7. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2ShRelationObject.java
  8. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2SpRelationObject.java
  9. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2BdRelationObject.java
  10. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2FlRelationObject.java
  11. 3 0
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2SpRelationObject.java
  12. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchSubsetBd2FlRelationObject.java
  13. 0 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechCtrlEqCtrlRelationObject.java
  14. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2BdRelationObject.java
  15. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2FlRelationObject.java
  16. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2ShRelationObject.java
  17. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2BdRelationObject.java
  18. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2FlRelationObject.java
  19. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2ShRelationObject.java
  20. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2SpRelationObject.java
  21. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2BdRelationObject.java
  22. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2FlRelationObject.java
  23. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2SpRelationObject.java
  24. 0 3
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/calculation/controller/AdmCalcSpecialController.java
  25. 0 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/calculation/service/impl/AdmManualRelCalServiceImpl.java
  26. 0 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmModelRelServiceImpl.java
  27. 0 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/MigrationLogServiceImpl.java
  28. 0 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/ObjectRelationMigration.java
  29. 4 4
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmComponentController.java
  30. 0 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java
  31. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmComponentServiceImpl.java
  32. 2 3
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmFloorServiceImpl.java
  33. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmShaftServiceImpl.java
  34. 3 3
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmSpaceServiceImpl.java
  35. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmSystemServiceImpl.java
  36. 0 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/report/controller/RelationReportController.java
  37. 4 0
      adm-business/adm-server/pom.xml
  38. 12 0
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/constant/AdmServerConstant.java
  39. 3 2
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/controller/AdmDeliverPlanController.java
  40. 52 1
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/controller/AdmModelController.java
  41. 26 2
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/dao/AdmModelFileMapper.java
  42. 3 0
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/domain/ModelFileVo.java
  43. 9 0
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/AdmDeliverPlanService.java
  44. 26 4
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/AdmModelService.java
  45. 12 1
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmDeliverPlanServiceImpl.java
  46. 105 6
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelServiceImpl.java
  47. 51 0
      adm-business/adm-server/src/main/resources/mapper/AdmModelFileMapper.xml
  48. 0 1
      adm-business/pom.xml
  49. 15 0
      adm-common/pom.xml
  50. 1 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/constant/GraphCodeEnum.java
  51. 1 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/constant/RelCodeEnum.java
  52. 14 1
      pom.xml

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

@@ -8,10 +8,13 @@
         <artifactId>adm-business</artifactId>
         <version>1.0.0</version>
     </parent>
-    <groupId>com.persagy</groupId>
     <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,14 +6,14 @@ 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.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
-import com.persagy.proxy.adm.constant.GraphCodeEnum;
-import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.strategy.RelationObjectContext;
 import com.persagy.proxy.report.model.EquipmentBindPointExcel;
 import com.persagy.proxy.report.model.EquipmentCountExcel;

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

@@ -8,14 +8,14 @@ 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.context.AppContext;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
-import com.persagy.proxy.adm.constant.GraphCodeEnum;
-import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.request.AdmDCSQueryRequest;
 import com.persagy.proxy.adm.strategy.RelationObjectContext;
 import com.persagy.proxy.report.service.IRelationReportService;

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

@@ -3,7 +3,6 @@ package com.persagy.proxy.adm.strategy.relationdata;
 import java.util.*;
 
 import cn.hutool.core.collection.CollUtil;
-import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
@@ -14,7 +13,6 @@ import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import org.json.JSONObject;
 
 /**
  * 报表数据抽象类

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

@@ -3,6 +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.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,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -3,6 +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.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,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -16,8 +18,6 @@ import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
-import com.persagy.proxy.adm.constant.GraphCodeEnum;
-import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;

+ 0 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechCtrlEqCtrlRelationObject.java

@@ -11,7 +11,6 @@ import com.persagy.dmp.digital.client.DigitalRelationFacade;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.proxy.adm.constant.AdmObjectInfoConstant;
 import com.persagy.proxy.adm.constant.AdmRelationType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.report.model.AdmRelationObject;

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

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

@@ -5,6 +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.helper.SpringHelper;
 import org.springframework.stereotype.Component;
 
@@ -18,8 +20,6 @@ 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.report.model.AdmRelationObject;
 import com.persagy.proxy.report.service.IRelationReportService;
 

+ 0 - 3
adm-business/adm-middleware/src/main/java/com/persagy/proxy/calculation/controller/AdmCalcSpecialController.java

@@ -1,8 +1,6 @@
 package com.persagy.proxy.calculation.controller;
 
-import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.common.exception.BusinessException;
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.constant.BusinessErrorRwdCode;
 import com.persagy.proxy.adm.request.AdmResponse;
@@ -10,7 +8,6 @@ import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.calculation.service.AdmCalcSpecialService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;

+ 0 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/calculation/service/impl/AdmManualRelCalServiceImpl.java

@@ -1,7 +1,6 @@
 package com.persagy.proxy.calculation.service.impl;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.constant.CommonConstant;

+ 0 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmModelRelServiceImpl.java

@@ -25,7 +25,6 @@ import com.persagy.proxy.object.model.AdmISpace;
 import com.persagy.proxy.object.service.IAdmEquipmentService;
 import com.persagy.proxy.object.service.IAdmFloorService;
 import com.persagy.proxy.object.service.IAdmISpaceService;
-import com.persagy.proxy.object.service.IAdmSpaceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

+ 0 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/MigrationLogServiceImpl.java

@@ -2,7 +2,6 @@ package com.persagy.proxy.migration.service.Impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.define.client.DigitalGraphDefineFacade;

+ 0 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/ObjectRelationMigration.java

@@ -15,7 +15,6 @@ import com.persagy.dmp.define.client.DigitalRelationDefineFacade;
 import com.persagy.dmp.define.entity.GraphDefine;
 import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.digital.client.DigitalRelationFacade;
-import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.migrate.entity.SyncData;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
@@ -28,7 +27,6 @@ import com.persagy.proxy.migration.model.DataMigrationResponse;
 import com.persagy.proxy.migration.model.MigrationInfo;
 import com.persagy.proxy.migration.service.IDataMigration;
 import com.persagy.proxy.migration.service.IDataMigrationProcess;
-import com.persagy.proxy.migration.service.Impl.MigrationAbstractServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -6,13 +6,13 @@ 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.helper.SpringHelper;
 import com.persagy.dmp.digital.client.DigitalRelationFacade;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
-import com.persagy.proxy.adm.constant.GraphCodeEnum;
-import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
@@ -125,8 +125,8 @@ public class AdmComponentController {
                 node.putPOJO("creator",context.getUserId());
                 node.putPOJO("updateApp",AdmCommonConstant.APP_ID);
                 node.putPOJO("modifier",context.getUserId());
-                node.putPOJO("graphCode",GraphCodeEnum.MechSubset.name());
-                node.putPOJO("relCode",RelCodeEnum.Eq2Ec.name());
+                node.putPOJO("graphCode", GraphCodeEnum.MechSubset.name());
+                node.putPOJO("relCode", RelCodeEnum.Eq2Ec.name());
                 node.putPOJO("graphId",StrUtil.format(CommonConstant.DEFAULT_GRAPH_ID_FORMAT,GraphCodeEnum.MechSubset.name()));
                 node.putPOJO("valid",1);
                 node.putPOJO("objFrom",component.getParentId());

+ 0 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java

@@ -60,7 +60,6 @@ import java.awt.Color;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.*;

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

@@ -3,10 +3,10 @@ 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.helper.SpringHelper;
-import com.persagy.proxy.adm.constant.GraphCodeEnum;
-import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.object.model.AdmComponent;

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

@@ -8,6 +8,8 @@ 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.context.AppContext;
@@ -16,8 +18,6 @@ import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.digital.client.DigitalRelationProjectCalFacade;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 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.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;
@@ -26,7 +26,6 @@ import com.persagy.proxy.calculation.service.AdmRelCalService;
 import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.object.model.AdmFloor;
-import com.persagy.proxy.object.model.AdmSpace;
 import com.persagy.proxy.object.service.IAdmFloorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

@@ -3,10 +3,10 @@ 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.helper.SpringHelper;
-import com.persagy.proxy.adm.constant.GraphCodeEnum;
-import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;

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

@@ -14,6 +14,8 @@ 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;
@@ -29,8 +31,6 @@ import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
 import com.persagy.proxy.adm.annotations.CascadeColumn;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 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.request.AdmDCSQueryRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
@@ -290,7 +290,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
         // 1.查询楼层下的空间的关系统计数据
         CommonResult<List<ObjectRelation>> floorCountByObjIds = DigitalObjectSimpleFacade
                 .queryRelationCountByObjIds(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID,
-                        getMultiBuildingOrFloorQueryWrapper(request,RelCodeEnum.Fl2Sp.name()));
+                        getMultiBuildingOrFloorQueryWrapper(request, RelCodeEnum.Fl2Sp.name()));
         List<ObjectRelation> floorSpaceData = floorCountByObjIds.getData();
         // 2.查询建筑下的空间的关系统计数据
         CommonResult<List<ObjectRelation>> buildingCountByObjIds = DigitalObjectSimpleFacade

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

@@ -7,12 +7,12 @@ 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.helper.SpringHelper;
 import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
-import com.persagy.proxy.adm.constant.GraphCodeEnum;
-import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;

+ 0 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/report/controller/RelationReportController.java

@@ -38,7 +38,6 @@ import com.persagy.proxy.report.model.EquipmentExcel;
 import com.persagy.proxy.report.service.IRelationReportService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.RequestBody;

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

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

+ 12 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/constant/AdmServerConstant.java

@@ -0,0 +1,12 @@
+package com.persagy.adm.server.algorithm.constant;
+/**
+ * adm-server使用的常量
+ * @author : lijie
+ * Update By 2022/1/19 17:41
+ */
+public interface AdmServerConstant {
+    /**楼层顺序码的信息点key值*/
+    String FLOOR_SEQUENCE_ID="floorSequenceID";
+
+
+}

+ 3 - 2
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/controller/AdmDeliverPlanController.java

@@ -3,6 +3,7 @@ package com.persagy.adm.server.algorithm.controller;
 import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
 import com.persagy.adm.server.algorithm.domain.ModelFileVo;
 import com.persagy.adm.server.algorithm.domain.QueryModelFileVo;
+import com.persagy.adm.server.algorithm.service.AdmDeliverPlanService;
 import com.persagy.adm.server.algorithm.service.AdmModelService;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
@@ -27,7 +28,7 @@ import java.util.List;
 @RequiredArgsConstructor
 public class AdmDeliverPlanController {
 
-    private final AdmModelService admModelService;
+    private final AdmDeliverPlanService admDeliverPlanService;
 
     /**
      * 020101-交付计划-处理BOSS产生的交付计划
@@ -38,7 +39,7 @@ public class AdmDeliverPlanController {
      */
     @PostMapping(value = "/relayDeliverPlan")
     public CommonResult<List<Void>> relayDeliverPlan(@Validated @RequestBody DeliverPlanVo deliverPlanVo) {
-        admModelService.relayDeliverPlan(deliverPlanVo);
+        admDeliverPlanService.relayDeliverPlan(deliverPlanVo);
         return ResultHelper.multi(new ArrayList<>());
     }
 

+ 52 - 1
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/controller/AdmModelController.java

@@ -1,10 +1,16 @@
 package com.persagy.adm.server.algorithm.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.persagy.adm.server.algorithm.constant.AdmServerConstant;
 import com.persagy.adm.server.algorithm.domain.ModelFileVo;
 import com.persagy.adm.server.algorithm.domain.QueryModelFileVo;
+import com.persagy.adm.server.algorithm.entity.AdmModelFile;
 import com.persagy.adm.server.algorithm.service.AdmModelService;
+import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,6 +20,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 01-模型文件管理
@@ -38,7 +46,41 @@ public class AdmModelController {
      */
     @PostMapping(value = "/queryModelFilesByBuildingId")
     public CommonResult<List<ModelFileVo>> queryFloorsByBuildingId(@RequestBody QueryModelFileVo queryModelFileVo) {
-        return ResultHelper.multi(new ArrayList<>());
+        // 1.根据建筑id查询建筑下的所有楼层
+        List<ObjectDigital> allFloors = admModelService.queryFloorsByBuildingId(queryModelFileVo.getBuildingId());
+        if (CollUtil.isEmpty(allFloors)){
+            return ResultHelper.multi(new ArrayList<>());
+        }
+        // 2.根据floorId查询最新的模型文件信息
+        Map<String, AdmModelFile> modelFileMap = admModelService
+                .queryCurrentModelFileByFloorIds(allFloors.stream().map(ObjectDigital::getId).collect(Collectors.toList()));
+        // 3.组装返回值
+        List<ModelFileVo> result = new ArrayList<>(allFloors.size());
+        for (ObjectDigital floor : allFloors) {
+            ModelFileVo vo = new ModelFileVo();
+            result.add(vo);
+            vo.setFloorId(floor.getId());
+            vo.setBuildingId(queryModelFileVo.getBuildingId());
+            vo.setFloorName(floor.getLocalName());
+            if (null!=floor.getInfos()
+                    && floor.getInfos().has(AdmServerConstant.FLOOR_SEQUENCE_ID)
+                    && floor.getInfos().get(AdmServerConstant.FLOOR_SEQUENCE_ID).isIntegralNumber()){
+                vo.setFloorSequenceId(floor.getInfos().get(AdmServerConstant.FLOOR_SEQUENCE_ID).asInt());
+            }
+            AdmModelFile admModelFile = modelFileMap.get(floor.getId());
+            if (null==admModelFile){
+                continue;
+            }
+            vo.setDataFileId(admModelFile.getDataFileId());
+            vo.setMinDataFileId(admModelFile.getMinDataFileId());
+            vo.setOriginalName(admModelFile.getOriginalName());
+            vo.setRevitFileId(admModelFile.getRevitFileId());
+            vo.setRevitVersion(admModelFile.getRevitVersion());
+            vo.setStatus(admModelFile.getStatus());
+            vo.setUserId(admModelFile.getUserId());
+            vo.setUserName(admModelFile.getUserName());
+        }
+        return ResultHelper.multi(result);
     }
     /**
      * 010102-模型文件-创建模型文件信息
@@ -50,6 +92,15 @@ public class AdmModelController {
      */
     @PostMapping(value = "/saveModelFile")
     public CommonResult<List<Void>> saveModelFile(@Validated @RequestBody ModelFileVo modelFileVo) {
+        Map<String, AdmModelFile> modelFileMap = admModelService.queryCurrentModelFileByFloorIds(CollUtil.newArrayList(modelFileVo.getFloorId()));
+        AdmModelFile admModelFile = modelFileMap.get(modelFileVo.getFloorId());
+        AdmModelFile modelFile = BeanUtil.copyProperties(modelFileVo, AdmModelFile.class);
+        modelFile.setGroupCode(AppContext.getContext().getGroupCode());
+        modelFile.setProjectId(AppContext.getContext().getProjectId());
+        modelFile.setCreator(AppContext.getContext().getAccountId());
+        modelFile.setModifier(AppContext.getContext().getAccountId());
+        admModelService.saveModelFile(modelFile);
+
         return ResultHelper.multi(new ArrayList<>());
     }
 

+ 26 - 2
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/dao/AdmModelFileMapper.java

@@ -1,13 +1,37 @@
 package com.persagy.adm.server.algorithm.dao;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.persagy.adm.server.algorithm.entity.AdmModelFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
- * @Entity com.persagy.adm.server.algorithm.entity.AdmModelFile
+ * adm模型文件DAO接口
+ * @author : lijie
+ * Update By 2022/1/19 16:53
  */
 public interface AdmModelFileMapper extends BaseMapper<AdmModelFile> {
-
+    /**
+     * 根据楼层id查询楼层当前的模型文件信息
+     * @param wrapper :查询条件
+     * @return : java.util.List<com.persagy.adm.server.algorithm.entity.AdmModelFile>
+     * @author : lijie
+     * Update By 2022/1/19 16:49
+     */
+    List<AdmModelFile> queryCurrentModelFileByFloorIds(@Param(Constants.WRAPPER) Wrapper<AdmModelFile> wrapper);
+    /**
+     * 插入实体对象
+     * @param modelFile : 模型文件
+     * return : void
+     * @author : lijie
+     * Update By 2022/1/19 18:33
+     */
+    void insertEntity(@Param("et") AdmModelFile modelFile);
 }
 
 

+ 3 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/domain/ModelFileVo.java

@@ -50,4 +50,7 @@ public class ModelFileVo {
     /**模型文件版本*/
     private String revitVersion;
 
+    /**楼层序号*/
+    private Integer floorSequenceId;
+
 }

+ 9 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/AdmDeliverPlanService.java

@@ -1,9 +1,18 @@
 package com.persagy.adm.server.algorithm.service;
 
+import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
+
 /**
  * 对接BOSS的交付计划逻辑处理接口
  * @author : lijie
  * Update By 2022/1/14 16:07
  */
 public interface AdmDeliverPlanService {
+    /**
+     * 处理BOSS产生的交付计划
+     * @param deliverPlanVo : 交付计划信息
+     * @author : lijie
+     * Update By 2022/1/14 17:22
+     */
+    void relayDeliverPlan(DeliverPlanVo deliverPlanVo);
 }

+ 26 - 4
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/AdmModelService.java

@@ -1,6 +1,11 @@
 package com.persagy.adm.server.algorithm.service;
 
 import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
+import com.persagy.adm.server.algorithm.entity.AdmModelFile;
+import com.persagy.dmp.digital.entity.ObjectDigital;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 模型文件的逻辑处理接口
@@ -9,10 +14,27 @@ import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
  */
 public interface AdmModelService {
     /**
-     * 处理BOSS产生的交付计划
-     * @param deliverPlanVo : 交付计划信息
+     * 根据建筑id查询建筑下的所有楼层
+     * @param buildingId : 建筑id
+     * @return : java.util.List<com.persagy.dmp.digital.entity.ObjectDigital>
+     * @author : lijie
+     * Update By 2022/1/19 10:04
+     */
+    List<ObjectDigital> queryFloorsByBuildingId(String buildingId);
+    /**
+     * 根据楼层id集合查询当前的模型文件信息
+     * @param floorIds : 楼层id集合
+     * @return : java.util.Map<java.lang.String,com.persagy.adm.server.algorithm.entity.AdmModelFile>  
+     * @author : lijie
+     * Update By 2022/1/19 14:34
+     */
+    Map<String, AdmModelFile> queryCurrentModelFileByFloorIds(List<String> floorIds);
+    /**
+     * 新增模型文件
+     * @param modelFile : 模型文件信息
+     * return : void
      * @author : lijie
-     * Update By 2022/1/14 17:22
+     * Update By 2022/1/19 17:54
      */
-    void relayDeliverPlan(DeliverPlanVo deliverPlanVo);
+    void saveModelFile(AdmModelFile modelFile);
 }

+ 12 - 1
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmDeliverPlanServiceImpl.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.server.algorithm.service.impl;
 
+import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
 import com.persagy.adm.server.algorithm.service.AdmDeliverPlanService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -10,7 +11,17 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class AdmDeliverPlanServiceImpl implements AdmDeliverPlanService {
 
-
+    /**
+     * 处理BOSS产生的交付计划
+     * @param deliverPlanVo : 交付计划信息
+     * @author : lijie
+     * Update By 2022/1/14 17:22
+     */
+    @Override
+    public void relayDeliverPlan(DeliverPlanVo deliverPlanVo) {
+        // 1.根据商品code与项目任务模板的映射数据与规则生成项目任务数据
+        // 2.调用dmp-rwd服务根据商品code生成交付范围
+    }
 
 
 

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

@@ -1,11 +1,37 @@
 package com.persagy.adm.server.algorithm.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+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.context.AppContext;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.helper.SpringHelper;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.digital.client.DigitalObjectFacade;
+import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import lombok.RequiredArgsConstructor;
 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;
+
 /**
  * 模型文件的逻辑处理类
  * @author : lijie
@@ -15,15 +41,88 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @RequiredArgsConstructor
 public class AdmModelServiceImpl implements AdmModelService {
+
+    private final AdmModelFileMapper admModelFileMapper;
+
+    /**
+     * 根据建筑id查询建筑下的所有楼层
+     * @param buildingId : 建筑id
+     * @return : java.util.List<com.persagy.dmp.digital.entity.ObjectDigital>
+     * @author : lijie
+     * Update By 2022/1/19 10:04
+     */
+    @Override
+    public List<ObjectDigital> queryFloorsByBuildingId(String buildingId) {
+        if (StrUtil.isBlank(buildingId)){
+            return new ArrayList<>();
+        }
+        // 构建查询参数,valid为true,并且是该建筑下的.且按floorSequenceID正序排序
+        QueryCriteria queryCriteria = new QueryCriteria();
+        ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
+        ObjectNode objectNode = objectMapper.createObjectNode();
+        objectNode.put(ObjectDigital.PROP_VALID,Boolean.TRUE);
+        objectNode.putPOJO(ObjectRelation.RELATION_TO_HUM,createRelationQueryNode(objectMapper, GraphCodeEnum.ArchSubset.name(),
+                RelCodeEnum.Bd2Fl.name(),buildingId));
+        queryCriteria.setCriteria(objectNode);
+        queryCriteria.setOrders(CollUtil.newArrayList(OrderItem.asc(AdmServerConstant.FLOOR_SEQUENCE_ID)));
+        CommonResult<List<ObjectDigital>> commonResult = DigitalObjectFacade.queryObject(AppContext.getContext().getGroupCode(),
+                AppContext.getContext().getProjectId(), AppContext.getContext().getAppId(),
+                AppContext.getContext().getAccountId(), queryCriteria);
+        if (!CommonConstant.QUERY_SUCCESS.equals(commonResult.getResult())){
+            throw new BusinessException(commonResult.getResult(),commonResult.getMessage());
+        }
+        if (CollUtil.isEmpty(commonResult.getData())){
+            return new ArrayList<>();
+        }
+        return commonResult.getData();
+    }
+    /**
+     * 根据楼层id集合查询当前的模型文件信息
+     * @param floorIds : 楼层id集合
+     * @return : java.util.Map<java.lang.String,com.persagy.adm.server.algorithm.entity.AdmModelFile>
+     * @author : lijie
+     * Update By 2022/1/19 14:34
+     */
+    @Override
+    public Map<String, AdmModelFile> queryCurrentModelFileByFloorIds(List<String> floorIds) {
+        LambdaQueryWrapper<AdmModelFile> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(AdmModelFile::getFloorId,floorIds);
+        queryWrapper.eq(AdmModelFile::getValid,Boolean.TRUE);
+        queryWrapper.eq(AdmModelFile::getRemoved,Boolean.FALSE);
+        List<AdmModelFile> admModelFiles = admModelFileMapper.queryCurrentModelFileByFloorIds(queryWrapper);
+        if (CollUtil.isEmpty(admModelFiles)){
+            return CollUtil.newHashMap();
+        }
+        return admModelFiles.stream().collect(Collectors.toMap(AdmModelFile::getFloorId,admModelFile -> admModelFile,(k1,k2)->k1));
+    }
     /**
-     * 处理BOSS产生的交付计划
-     * @param deliverPlanVo : 交付计划信息
+     * 新增模型文件
+     * @param modelFile : 模型文件信息
+     * return : void
      * @author : lijie
-     * Update By 2022/1/14 17:22
+     * Update By 2022/1/19 17:54
      */
     @Override
-    public void relayDeliverPlan(DeliverPlanVo deliverPlanVo) {
-        // 1.根据商品code与项目任务模板的映射数据与规则生成项目任务数据
-        // 2.调用dmp-rwd服务根据商品code生成交付范围
+    public void saveModelFile(AdmModelFile modelFile) {
+        admModelFileMapper.insertEntity(modelFile);
+    }
+
+    /**
+     * 创建关系查询对象
+     * @param objectMapper : objectMapper
+     * @param graphCode : 图类型编码
+     * @param relCode : 边类型编码
+     * @param buildingId : 建筑id
+     * @return : com.fasterxml.jackson.databind.node.ObjectNode
+     * @author : lijie
+     * Update By 2022/1/19 14:18
+     */
+    private ObjectNode createRelationQueryNode(ObjectMapper objectMapper, String graphCode, String relCode,
+                                               String buildingId) {
+        ObjectNode objectNode = objectMapper.createObjectNode();
+        objectNode.put(ObjectRelation.GRAPH_CODE_HUM,graphCode);
+        objectNode.put(ObjectRelation.REL_CODE_HUM,relCode);
+        objectNode.put(ObjectRelation.OBJ_FROM_HUM,buildingId);
+        return objectNode;
     }
 }

+ 51 - 0
adm-business/adm-server/src/main/resources/mapper/AdmModelFileMapper.xml

@@ -45,4 +45,55 @@
         creator,creation_time,modifier,
         modified_time,valid,ts
     </sql>
+    <insert id="insertEntity">
+        INSERT INTO adm_model_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            `id`,
+            <if test="null!=et.originalName and ''!=et.originalName">`original_name`,</if>
+            `version`,
+            <if test="null!=et.userId and ''!=et.userId">`user_id`,</if>
+            <if test="null!=et.userName and ''!=et.userName">`user_name`,</if>
+            <if test="null!=et.status">`status`,</if>
+            <if test="null!=et.revitFileId and ''!=et.revitFileId">`revit_file_id`,</if>
+            <if test="null!=et.dataFileId and ''!=et.dataFileId">`data_file_id`,</if>
+            <if test="null!=et.floorId and ''!=et.floorId">`floor_id`,</if>
+            <if test="null!=et.buildingId and ''!=et.buildingId">`building_id`,</if>
+            <if test="null!=et.projectId and ''!=et.projectId">`project_id`,</if>
+            <if test="null!=et.groupCode and ''!=et.groupCode">`group_code`,</if>
+            <if test="null!=et.revitVersion and ''!=et.revitVersion">`revit_version`,</if>
+            <if test="null!=et.creator and ''!=et.creator">`creator`,</if>
+            <if test="null!=et.modifier and ''!=et.modifier">`modifier`,</if>
+            `creation_time`,
+            `modified_time`
+        </trim>
+        SELECT
+        <trim suffixOverrides=",">
+            #{et.id},
+            <if test="null!=et.originalName and ''!=et.originalName">#{et.originalName},</if>
+            (SELECT IFNULL(MAX(version),0)+1 AS version FROM adm_model_file WHERE floor_id=#{et.floorId}),
+            <if test="null!=et.userId and ''!=et.userId">#{et.userId},</if>
+            <if test="null!=et.userName and ''!=et.userName">#{et.userName},</if>
+            <if test="null!=et.status">#{et.status},</if>
+            <if test="null!=et.revitFileId and ''!=et.revitFileId">#{et.revitFileId},</if>
+            <if test="null!=et.dataFileId and ''!=et.dataFileId">#{et.dataFileId},</if>
+            <if test="null!=et.floorId and ''!=et.floorId">#{et.floorId},</if>
+            <if test="null!=et.buildingId and ''!=et.buildingId">#{et.buildingId},</if>
+            <if test="null!=et.projectId and ''!=et.projectId">#{et.projectId},</if>
+            <if test="null!=et.groupCode and ''!=et.groupCode">#{et.groupCode},</if>
+            <if test="null!=et.revitVersion and ''!=et.revitVersion">#{et.revitVersion},</if>
+            #{et.creator},
+            #{et.modifier},
+            #{et.creationTime},
+            #{et.modifiedTime}
+        </trim>
+        FROM DUAL;
+    </insert>
+    <select id="queryCurrentModelFileByFloorIds"
+            resultType="com.persagy.adm.server.algorithm.entity.AdmModelFile">
+        SELECT * FROM adm_model_file
+                INNER JOIN (SELECT floor_id,MAX(version) AS version FROM adm_model_file
+                    ${ew.customSqlSegment} GROUP BY floor_id
+                HAVING MAX(version)=version) AS temp
+                    ON(temp.floor_id=adm_model_file.floor_id AND temp.version=adm_model_file.version);
+    </select>
 </mapper>

+ 0 - 1
adm-business/pom.xml

@@ -8,7 +8,6 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.persagy</groupId>
     <artifactId>adm-business</artifactId>
     <packaging>pom</packaging>
 

+ 15 - 0
adm-common/pom.xml

@@ -0,0 +1,15 @@
+<?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>

+ 1 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/constant/GraphCodeEnum.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.constant;
+package com.persagy.adm.common.constant;
 
 /**
  * 图类型编码

+ 1 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/constant/RelCodeEnum.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.constant;
+package com.persagy.adm.common.constant;
 
 /**
  * 边类型编码

+ 14 - 1
pom.xml

@@ -8,12 +8,25 @@
         <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.persagy</groupId>
     <artifactId>adm</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
 
     <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>