浏览代码

代码分包

yucheng 3 年之前
父节点
当前提交
7ad89d2554
共有 100 个文件被更改,包括 201 次插入483 次删除
  1. 1 1
      src/main/java/com/persagy/proxy/adm/constant/enums/AdmDictCategoryEnum.java
  2. 0 39
      src/main/java/com/persagy/proxy/adm/constant/enums/ValidEnum.java
  3. 0 65
      src/main/java/com/persagy/proxy/adm/controller/AdmRelationController.java
  4. 4 4
      src/main/java/com/persagy/proxy/adm/handler/RelationReportHandler.java
  5. 2 2
      src/main/java/com/persagy/proxy/adm/handler/SpaceRelationInfoHandler.java
  6. 0 20
      src/main/java/com/persagy/proxy/adm/model/AdmBIMLocation.java
  7. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmSBaseEntity.java
  8. 0 19
      src/main/java/com/persagy/proxy/adm/model/AdmEquipFamilyCategory.java
  9. 0 10
      src/main/java/com/persagy/proxy/adm/model/AdmEquipTypeLabsl.java
  10. 11 0
      src/main/java/com/persagy/proxy/adm/model/AdmPoint.java
  11. 0 20
      src/main/java/com/persagy/proxy/adm/model/AdmPointPosition.java
  12. 1 1
      src/main/java/com/persagy/proxy/adm/dto/TwicePointDTO.java
  13. 0 0
      src/main/java/com/persagy/proxy/adm/model/relation/FloorQueryRequest.java
  14. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmDCSQueryRequest.java
  15. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmDictQueryCriteria.java
  16. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmUpDataFloorAndBuildingRequests.java
  17. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmZoneEquipQueryRequest.java
  18. 0 10
      src/main/java/com/persagy/proxy/adm/service/IAdmDoorService.java
  19. 0 17
      src/main/java/com/persagy/proxy/adm/service/IAdmDtRelationService.java
  20. 0 11
      src/main/java/com/persagy/proxy/adm/service/IAdmISpaceService.java
  21. 0 11
      src/main/java/com/persagy/proxy/adm/service/IAdmPropertyService.java
  22. 0 13
      src/main/java/com/persagy/proxy/adm/service/IAdmRelationTypeService.java
  23. 0 10
      src/main/java/com/persagy/proxy/adm/service/IAdmSpVerticalSpService.java
  24. 0 11
      src/main/java/com/persagy/proxy/adm/service/IAdmTenantService.java
  25. 0 21
      src/main/java/com/persagy/proxy/adm/service/impl/AdmDtRelationServiceImpl.java
  26. 8 10
      src/main/java/com/persagy/proxy/adm/strategy/RelationObjectContext.java
  27. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/AbstractRelationObject.java
  28. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/AbstractReportRelationObject.java
  29. 9 15
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java
  30. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2FlRelationObject.java
  31. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2ShRelationObject.java
  32. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2SpRelationObject.java
  33. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2BdRelationObject.java
  34. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2FlRelationObject.java
  35. 1 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchSubsetBd2FlRelationObject.java
  36. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkMixMechRelationObject.java
  37. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkNaturalRelationObject.java
  38. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkOnewayMechRelationObject.java
  39. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqBackupRelationObject.java
  40. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqNormalRelationObject.java
  41. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyBackupRelationObject.java
  42. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyNormalRelationObject.java
  43. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2BdRelationObject.java
  44. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2FlRelationObject.java
  45. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2ShRelationObject.java
  46. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2BdRelationObject.java
  47. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2FlRelationObject.java
  48. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2ShRelationObject.java
  49. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2SpRelationObject.java
  50. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2BdRelationObject.java
  51. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2FlRelationObject.java
  52. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2SpRelationObject.java
  53. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkConnectRelationObject.java
  54. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkTransparentRelationObject.java
  55. 1 1
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/RelationObjectStrategy.java
  56. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2EqRelationObject.java
  57. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SpRelationObject.java
  58. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SyRelationObject.java
  59. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFCloseRelationObject.java
  60. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFOpenRelationObject.java
  61. 2 2
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkNormalRelationObject.java
  62. 2 2
      src/main/java/com/persagy/proxy/adm/controller/AdmCalcSpecialController.java
  63. 5 5
      src/main/java/com/persagy/proxy/adm/controller/AdmManualRelCalController.java
  64. 3 3
      src/main/java/com/persagy/proxy/adm/controller/AdmMepSystemCalcController.java
  65. 3 3
      src/main/java/com/persagy/proxy/adm/controller/AdmModelRelController.java
  66. 2 3
      src/main/java/com/persagy/proxy/adm/controller/AdmRelCalController.java
  67. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmManualRelCalRequest.java
  68. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmManualRelationCalcDel.java
  69. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmMepSourceTypeEntity.java
  70. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmRelationAddRequest.java
  71. 1 1
      src/main/java/com/persagy/proxy/adm/service/AdmCalcSpecialService.java
  72. 4 5
      src/main/java/com/persagy/proxy/adm/service/AdmManualRelCalService.java
  73. 2 2
      src/main/java/com/persagy/proxy/adm/service/AdmMepSystemCalcService.java
  74. 1 1
      src/main/java/com/persagy/proxy/adm/service/AdmRelCalService.java
  75. 2 1
      src/main/java/com/persagy/proxy/adm/service/IAdmObjectRelationCalService.java
  76. 2 3
      src/main/java/com/persagy/proxy/adm/service/impl/AdmCalcSpecialServiceImpl.java
  77. 5 6
      src/main/java/com/persagy/proxy/adm/service/impl/AdmManualRelCalServiceImpl.java
  78. 3 3
      src/main/java/com/persagy/proxy/adm/service/impl/AdmMepSystemCalcServiceImpl.java
  79. 3 3
      src/main/java/com/persagy/proxy/adm/service/impl/AdmObjectRelationCalServiceImpl.java
  80. 3 8
      src/main/java/com/persagy/proxy/adm/service/impl/AdmRelCalServiceImpl.java
  81. 10 5
      src/main/java/com/persagy/proxy/adm/controller/AdmDictController.java
  82. 4 5
      src/main/java/com/persagy/proxy/adm/controller/AdmLabslController.java
  83. 3 3
      src/main/java/com/persagy/proxy/adm/controller/AdmModelController.java
  84. 5 7
      src/main/java/com/persagy/proxy/adm/controller/AdmPlanarController.java
  85. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmDefFuncIdGather.java
  86. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmDict.java
  87. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmDictBatch.java
  88. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmGraphicType.java
  89. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmModelKey.java
  90. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmModelRel.java
  91. 1 2
      src/main/java/com/persagy/proxy/adm/model/AdmObjectType.java
  92. 1 2
      src/main/java/com/persagy/proxy/adm/model/AdmPlanarEquipRequests.java
  93. 1 1
      src/main/java/com/persagy/proxy/adm/model/AdmRelationType.java
  94. 1 2
      src/main/java/com/persagy/proxy/adm/service/IAdmDictBaseService.java
  95. 4 4
      src/main/java/com/persagy/proxy/adm/service/IAdmDictService.java
  96. 4 3
      src/main/java/com/persagy/proxy/adm/service/IAdmGraphicTypeService.java
  97. 1 1
      src/main/java/com/persagy/proxy/adm/service/IAdmModelKeyService.java
  98. 4 4
      src/main/java/com/persagy/proxy/adm/service/IAdmModelRelService.java
  99. 4 4
      src/main/java/com/persagy/proxy/adm/service/IAdmPlanarService.java
  100. 0 0
      src/main/java/com/persagy/proxy/dictionary/service/IAdmRelationTypeService.java

+ 1 - 1
src/main/java/com/persagy/proxy/adm/constant/enums/AdmDictCategoryEnum.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.constant.enums;
+package com.persagy.proxy.adm.constant;
 
 import java.util.ArrayList;
 import java.util.List;

+ 0 - 39
src/main/java/com/persagy/proxy/adm/constant/enums/ValidEnum.java

@@ -1,39 +0,0 @@
-package com.persagy.proxy.adm.constant.enums;
-
-/**
- * @ClassName ValidEnum
- * @Description: 有效标示
- * @Author linhuili
- * @Date 2021/9/2 11:12
- * @Version V1.0
- **/
-
-public enum ValidEnum {
-    /** 有效标识 */
-    FALSE(0, false),
-    TRUE(1, true);
-
-    private Integer value;
-    private Boolean desc;
-
-    ValidEnum(Integer value, Boolean desc) {
-        this.value = value;
-        this.desc = desc;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    public void setValue(Integer value) {
-        this.value = value;
-    }
-
-    public Boolean getDesc() {
-        return desc;
-    }
-
-    public void setDesc(Boolean desc) {
-        this.desc = desc;
-    }
-}

+ 0 - 65
src/main/java/com/persagy/proxy/adm/controller/AdmRelationController.java

@@ -1,65 +0,0 @@
-package com.persagy.proxy.adm.controller;
-
-import cn.hutool.core.collection.CollUtil;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.common.helper.SpringHelper;
-import com.persagy.dmp.digital.entity.ObjectRelation;
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.proxy.adm.model.AdmFloor;
-import com.persagy.proxy.adm.model.AdmGraphicType;
-import com.persagy.proxy.adm.model.AdmRelationType;
-import com.persagy.proxy.adm.model.AdmWindow;
-import com.persagy.proxy.adm.request.AdmCreateRequest;
-import com.persagy.proxy.adm.request.AdmQueryCriteria;
-import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.IAdmGraphicTypeService;
-import com.persagy.proxy.adm.service.IAdmRelationService;
-import com.persagy.proxy.adm.service.IAdmRelationTypeService;
-import com.persagy.proxy.adm.service.IAdmWindowService;
-import com.persagy.proxy.adm.utils.AdmContextUtil;
-import com.persagy.proxy.common.entity.InstanceUrlParam;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.ws.rs.QueryParam;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * ADM 窗户 API
- * @author xujiaheng
- * @date 2021-09-3
- */
-@RestController
-@RequestMapping("/rel")
-public class AdmRelationController {
-
-    @Autowired
-    private IAdmGraphicTypeService service;
-
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
-    /**
-     * 创建
-     * @param
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/equip/category")
-    public AdmResponse equipRel(@QueryParam("projectId") String projectId) {
-        //组装上下文条件
-        InstanceUrlParam context = AdmContextUtil.toDmpContext();
-        AdmResponse res = service.query(context);
-        return res;
-    }
-}

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

@@ -24,10 +24,10 @@ import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
-import com.persagy.proxy.adm.model.EquipmentBindPointExcel;
-import com.persagy.proxy.adm.model.EquipmentCountExcel;
-import com.persagy.proxy.adm.model.EquipmentExcel;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.EquipmentBindPointExcel;
+import com.persagy.proxy.report.model.EquipmentCountExcel;
+import com.persagy.proxy.report.model.EquipmentExcel;
+import com.persagy.proxy.report.service.IRelationReportService;
 import com.persagy.proxy.adm.strategy.RelationObjectContext;
 
 import cn.hutool.core.collection.CollectionUtil;

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

@@ -22,8 +22,8 @@ import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
-import com.persagy.proxy.adm.model.AdmDCSQueryRequest;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.adm.request.AdmDCSQueryRequest;
+import com.persagy.proxy.report.service.IRelationReportService;
 import com.persagy.proxy.adm.strategy.RelationObjectContext;
 
 import cn.hutool.core.collection.CollectionUtil;

+ 0 - 20
src/main/java/com/persagy/proxy/adm/model/AdmBIMLocation.java

@@ -1,20 +0,0 @@
-package com.persagy.proxy.adm.model;
-
-import lombok.Data;
-
-/**
- * BIM模型中坐标json
- * @author lvxy
- * @date 2021/8/17
- */
-@Data
-public class AdmBIMLocation {
-    /** 坐标x */
-    private Double x;
-
-    /** 坐标y */
-    private Double y;
-
-    /** 坐标z */
-    private Double z;
-}

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmSBaseEntity.java

@@ -9,7 +9,7 @@ import java.util.Map;
  * @date 2021/9/13
  */
 @Data
-public abstract class AdmSBaseEntity<T> extends BaseEntity {
+public abstract class AdmBaseEntity<T> extends BaseEntity {
     /** 统计信息 */
     private Map<String, Object> statistics;
     /** 信息点 */

+ 0 - 19
src/main/java/com/persagy/proxy/adm/model/AdmEquipFamilyCategory.java

@@ -1,19 +0,0 @@
-package com.persagy.proxy.adm.model;
-
-import lombok.Data;
-
-/**
- * @ClassName AdmEquipFamilyCategory
- * @Description: ADM设备族
- * @Author linhuili
- * @Date 2021/9/1 14:05
- * @Version V1.0
- **/
-@Data
-public class AdmEquipFamilyCategory {
-  /** 族编码 */
-  private String family;
-
-  /** 族名称 */
-  private String familyName;
-}

+ 0 - 10
src/main/java/com/persagy/proxy/adm/model/AdmEquipTypeLabsl.java

@@ -1,10 +0,0 @@
-package com.persagy.proxy.adm.model;
-
-import lombok.Data;
-
-@Data
-public class AdmEquipTypeLabsl {
-    /** 类型名称 */
-    private String codeName;
-
-}

+ 11 - 0
src/main/java/com/persagy/proxy/adm/model/AdmPoint.java

@@ -2,8 +2,19 @@ package com.persagy.proxy.adm.model;
 
 import lombok.Data;
 
+/**
+ * 点位X 、Y
+ * @author lvxy
+ * @date 2021/8/17
+ */
+@Data
 public class AdmPoint {
+    /** 坐标x */
     private Double x;
+
+    /** 坐标y */
     private Double y;
+
+    /** 坐标z */
     private Double z;
 }

+ 0 - 20
src/main/java/com/persagy/proxy/adm/model/AdmPointPosition.java

@@ -1,20 +0,0 @@
-package com.persagy.proxy.adm.model;
-
-import lombok.Data;
-
-/**
- * 点位X 、Y
- * @author lvxy
- * @date 2021/8/17
- */
-@Data
-public class AdmPointPosition {
-    /** 坐标x */
-    private Double x;
-
-    /** 坐标y */
-    private Double y;
-
-    /** 坐标z */
-    private Double z;
-}

+ 1 - 1
src/main/java/com/persagy/proxy/adm/dto/TwicePointDTO.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.dto;
+package com.persagy.proxy.adm.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 0 - 0
src/main/java/com/persagy/proxy/adm/model/relation/FloorQueryRequest.java


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

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.adm.request;
 
 import java.util.Set;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmDictQueryCriteria.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.adm.request;
 
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import lombok.Data;

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmUpDataFloorAndBuildingRequests.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.adm.request;
 
 import lombok.Data;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmZoneEquipQueryRequest.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.adm.request;
 
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import lombok.Data;

+ 0 - 10
src/main/java/com/persagy/proxy/adm/service/IAdmDoorService.java

@@ -1,10 +0,0 @@
-package com.persagy.proxy.adm.service;
-
-import com.persagy.proxy.adm.model.AdmDoor;
-/**
- * ADM 门接口类
- * @author xujiaheng
- * @date 2021-09-16
- */
-public interface IAdmDoorService extends IAdmBaseService<AdmDoor> {
-}

+ 0 - 17
src/main/java/com/persagy/proxy/adm/service/IAdmDtRelationService.java

@@ -1,17 +0,0 @@
-package com.persagy.proxy.adm.service;
-
-import com.persagy.proxy.adm.model.AdmDtRelation;
-import com.persagy.proxy.adm.model.AdmGraphicType;
-import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.common.entity.InstanceUrlParam;
-
-/**
- * ADM 图解接口
- * @author lvxy
- * @date 2021/8/18
- */
-public interface IAdmDtRelationService extends IAdmBaseService<AdmDtRelation>{
-
-
-
-}

+ 0 - 11
src/main/java/com/persagy/proxy/adm/service/IAdmISpaceService.java

@@ -1,11 +0,0 @@
-package com.persagy.proxy.adm.service;
-
-import com.persagy.proxy.adm.model.AdmISpace;
-
-/**
- * 模型空间接口
- * @author lvxy
- * @date 2021/8/24
- */
-public interface IAdmISpaceService extends IAdmBaseService<AdmISpace>{
-}

+ 0 - 11
src/main/java/com/persagy/proxy/adm/service/IAdmPropertyService.java

@@ -1,11 +0,0 @@
-package com.persagy.proxy.adm.service;
-
-import com.persagy.proxy.adm.model.AdmProperty;
-
-/**
- * ADM 资产 接口
- * @author lvxy
- * @date 2021/8/18
- */
-public interface IAdmPropertyService extends IAdmBaseService<AdmProperty>{
-}

+ 0 - 13
src/main/java/com/persagy/proxy/adm/service/IAdmRelationTypeService.java

@@ -1,13 +0,0 @@
-package com.persagy.proxy.adm.service;
-
-import com.persagy.proxy.adm.model.AdmRelationType;
-
-/**
- * ADM 图解接口
- * @author lvxy
- * @date 2021/8/18
- */
-public interface IAdmRelationTypeService extends IAdmBaseService<AdmRelationType>{
-
-
-}

+ 0 - 10
src/main/java/com/persagy/proxy/adm/service/IAdmSpVerticalSpService.java

@@ -1,10 +0,0 @@
-package com.persagy.proxy.adm.service;
-
-import com.persagy.proxy.adm.model.equip.SpVerticalSp;
-
-/**
- * @author zhangwencheng
- * 空间的垂直交通关系
- */
-public interface IAdmSpVerticalSpService extends IAdmBaseService<SpVerticalSp> {
-}

+ 0 - 11
src/main/java/com/persagy/proxy/adm/service/IAdmTenantService.java

@@ -1,11 +0,0 @@
-package com.persagy.proxy.adm.service;
-
-import com.persagy.proxy.adm.model.AdmTenant;
-
-/**
- * ADM 租户 接口
- * @author lvxy
- * @date 2021/8/18
- */
-public interface IAdmTenantService extends IAdmBaseService<AdmTenant>{
-}

+ 0 - 21
src/main/java/com/persagy/proxy/adm/service/impl/AdmDtRelationServiceImpl.java

@@ -1,21 +0,0 @@
-package com.persagy.proxy.adm.service.impl;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.persagy.proxy.adm.model.AdmDtRelation;
-import com.persagy.proxy.adm.service.IAdmDtRelationService;
-import com.persagy.proxy.common.client.DmpRwdClient;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * ADM 设备 实现
- * @author lvxy
- * @date 2021/8/18
- */
-@Slf4j
-@Service
-public class AdmDtRelationServiceImpl extends AbstractAdmBaseServiceImpl<AdmDtRelation> implements IAdmDtRelationService {
-
-
-}

+ 8 - 10
src/main/java/com/persagy/proxy/adm/strategy/RelationObjectContext.java

@@ -1,20 +1,18 @@
 package com.persagy.proxy.adm.strategy;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
 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.model.AdmRelationObject;
 import com.persagy.proxy.adm.strategy.relationdata.RelationObjectStrategy;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 获取关系对象的上下文类

+ 2 - 2
src/main/java/com/persagy/proxy/adm/strategy/relationdata/AbstractRelationObject.java

@@ -9,8 +9,8 @@ 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.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 

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

@@ -8,8 +8,8 @@ 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.constant.ObjTypeMapping;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

+ 9 - 15
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java

@@ -1,11 +1,7 @@
 package com.persagy.proxy.adm.strategy.relationdata;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.stereotype.Component;
-
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
@@ -13,16 +9,14 @@ import com.persagy.dmp.common.model.response.CommonResult;
 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.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;
+import com.persagy.proxy.adm.constant.*;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
+import org.springframework.stereotype.Component;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,7 +17,7 @@ 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.adm.service.IRelationReportService;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.SpaceTypeEnum;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.SpaceTypeEnum;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.SpaceTypeEnum;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -18,8 +18,8 @@ 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;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.SpaceTypeEnum;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.SpaceTypeEnum;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.digital.entity.ObjectDigital;
-import com.persagy.proxy.adm.model.AdmRelationObject;
+import com.persagy.proxy.report.model.AdmRelationObject;
 
 /**
  * 

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

@@ -17,8 +17,8 @@ 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.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.SpaceTypeEnum;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.SpaceTypeEnum;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

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

@@ -17,8 +17,8 @@ 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.SpaceTypeEnum;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.service.IRelationReportService;
+import com.persagy.proxy.report.model.AdmRelationObject;
+import com.persagy.proxy.report.service.IRelationReportService;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

+ 2 - 2
src/main/java/com/persagy/proxy/adm/controller/AdmCalcSpecialController.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.calculation.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.common.exception.BusinessException;
@@ -6,7 +6,7 @@ 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;
-import com.persagy.proxy.adm.service.AdmCalcSpecialService;
+import com.persagy.proxy.calculation.service.AdmCalcSpecialService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;

+ 5 - 5
src/main/java/com/persagy/proxy/adm/controller/AdmManualRelCalController.java

@@ -1,11 +1,11 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.calculation.controller;
 
-import com.persagy.proxy.adm.model.AdmManualRelCalRequest;
-import com.persagy.proxy.adm.model.AdmManualRelationCalcDel;
-import com.persagy.proxy.adm.model.AdmRelationAddRequest;
+import com.persagy.proxy.calculation.model.AdmManualRelCalRequest;
+import com.persagy.proxy.calculation.model.AdmManualRelationCalcDel;
+import com.persagy.proxy.calculation.model.AdmRelationAddRequest;
 import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.AdmManualRelCalService;
+import com.persagy.proxy.calculation.service.AdmManualRelCalService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;

+ 3 - 3
src/main/java/com/persagy/proxy/adm/controller/AdmMepSystemCalcController.java

@@ -1,9 +1,9 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.calculation.controller;
 
-import com.persagy.proxy.adm.model.AdmMepSourceTypeEntity;
+import com.persagy.proxy.calculation.model.AdmMepSourceTypeEntity;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.AdmMepSystemCalcService;
+import com.persagy.proxy.calculation.service.AdmMepSystemCalcService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;

+ 3 - 3
src/main/java/com/persagy/proxy/adm/controller/AdmModelRelController.java

@@ -1,9 +1,9 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.calculation.controller;
 
 import com.persagy.dmp.common.exception.BusinessException;
-import com.persagy.proxy.adm.model.AdmModelRel;
+import com.persagy.proxy.dictionary.model.AdmModelRel;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.IAdmModelRelService;
+import com.persagy.proxy.dictionary.service.IAdmModelRelService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

+ 2 - 3
src/main/java/com/persagy/proxy/adm/controller/AdmRelCalController.java

@@ -1,11 +1,11 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.calculation.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.constant.BusinessErrorRwdCode;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.AdmRelCalService;
+import com.persagy.proxy.calculation.service.AdmRelCalService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.RequiredArgsConstructor;
@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.QueryParam;
 import java.util.ArrayList;
 import java.util.Map;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmManualRelCalRequest.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.calculation.model;
 
 import lombok.Data;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmManualRelationCalcDel.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.calculation.model;
 
 import lombok.Data;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmMepSourceTypeEntity.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.calculation.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmRelationAddRequest.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.calculation.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonAlias;

+ 1 - 1
src/main/java/com/persagy/proxy/adm/service/AdmCalcSpecialService.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.calculation.service;
 
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.request.AdmResponse;

+ 4 - 5
src/main/java/com/persagy/proxy/adm/service/AdmManualRelCalService.java

@@ -1,10 +1,9 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.calculation.service;
 
-import com.persagy.proxy.adm.model.AdmManualRelCalRequest;
-import com.persagy.proxy.adm.model.AdmManualRelationCalcDel;
-import com.persagy.proxy.adm.model.AdmRelationAddRequest;
+import com.persagy.proxy.calculation.model.AdmManualRelCalRequest;
+import com.persagy.proxy.calculation.model.AdmManualRelationCalcDel;
+import com.persagy.proxy.calculation.model.AdmRelationAddRequest;
 import com.persagy.proxy.adm.request.AdmCreateResponse;
-import com.persagy.proxy.adm.request.AdmManualRelCalResponse;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 

+ 2 - 2
src/main/java/com/persagy/proxy/adm/service/AdmMepSystemCalcService.java

@@ -1,6 +1,6 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.calculation.service;
 
-import com.persagy.proxy.adm.model.AdmMepSourceTypeEntity;
+import com.persagy.proxy.calculation.model.AdmMepSourceTypeEntity;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.common.entity.InstanceUrlParam;

+ 1 - 1
src/main/java/com/persagy/proxy/adm/service/AdmRelCalService.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.calculation.service;
 
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.request.AdmResponse;

+ 2 - 1
src/main/java/com/persagy/proxy/adm/service/IAdmObjectRelationCalService.java

@@ -1,6 +1,7 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.calculation.service;
 
 import com.persagy.dmp.digital.entity.ObjectRelationProjectCal;
+import com.persagy.proxy.adm.service.IAdmBaseService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 
 import java.util.List;

+ 2 - 3
src/main/java/com/persagy/proxy/adm/service/impl/AdmCalcSpecialServiceImpl.java

@@ -1,12 +1,11 @@
-package com.persagy.proxy.adm.service.impl;
+package com.persagy.proxy.calculation.service.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.digital.client.DigitalRelationCaclFacade;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.AdmCalcSpecialService;
+import com.persagy.proxy.calculation.service.AdmCalcSpecialService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+ 5 - 6
src/main/java/com/persagy/proxy/adm/service/impl/AdmManualRelCalServiceImpl.java

@@ -1,7 +1,6 @@
-package com.persagy.proxy.adm.service.impl;
+package com.persagy.proxy.calculation.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.context.AppContext;
@@ -12,13 +11,13 @@ import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmObjectInfoConstant;
 import com.persagy.proxy.adm.constant.BusinessErrorRwdCode;
-import com.persagy.proxy.adm.model.AdmManualRelCalRequest;
-import com.persagy.proxy.adm.model.AdmManualRelationCalcDel;
-import com.persagy.proxy.adm.model.AdmRelationAddRequest;
+import com.persagy.proxy.calculation.model.AdmManualRelCalRequest;
+import com.persagy.proxy.calculation.model.AdmManualRelationCalcDel;
+import com.persagy.proxy.calculation.model.AdmRelationAddRequest;
 import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmManualRelCalResponse;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.AdmManualRelCalService;
+import com.persagy.proxy.calculation.service.AdmManualRelCalService;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.RequiredArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.service.impl;
+package com.persagy.proxy.calculation.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.persagy.dmp.basic.dto.DefineRequestData;
@@ -6,10 +6,10 @@ import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.define.client.DigitalEquipClassRelFacade;
 import com.persagy.dmp.define.entity.DigitalEquipClassRel;
-import com.persagy.proxy.adm.model.AdmMepSourceTypeEntity;
+import com.persagy.proxy.calculation.model.AdmMepSourceTypeEntity;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.AdmMepSystemCalcService;
+import com.persagy.proxy.calculation.service.AdmMepSystemCalcService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,13 +1,13 @@
-package com.persagy.proxy.adm.service.impl;
+package com.persagy.proxy.calculation.service.impl;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.digital.entity.ObjectRelationProjectCal;
-import com.persagy.proxy.adm.model.AdmModelRel;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.IAdmObjectRelationCalService;
+import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;
+import com.persagy.proxy.calculation.service.IAdmObjectRelationCalService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

+ 3 - 8
src/main/java/com/persagy/proxy/adm/service/impl/AdmRelCalServiceImpl.java

@@ -1,7 +1,6 @@
-package com.persagy.proxy.adm.service.impl;
+package com.persagy.proxy.calculation.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.math.MathUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -9,7 +8,6 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.response.CommonResult;
@@ -17,17 +15,14 @@ import com.persagy.dmp.digital.client.DigitalObjectFacade;
 import com.persagy.dmp.digital.client.DigitalRelationCaclFacade;
 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.AdmObjectInfoConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
-import com.persagy.proxy.adm.constant.ObjTypeMapping;
-import com.persagy.proxy.adm.dto.TwicePointDTO;
+import com.persagy.proxy.adm.model.TwicePointDTO;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.AdmRelCalService;
 import com.persagy.proxy.adm.utils.GeoToolsUtil;
+import com.persagy.proxy.calculation.service.AdmRelCalService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

+ 10 - 5
src/main/java/com/persagy/proxy/adm/controller/AdmDictController.java

@@ -1,16 +1,21 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.dictionary.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.persagy.dmp.define.entity.ObjectInfoCollect;
 import com.persagy.proxy.adm.constant.AdmDictConstant;
-import com.persagy.proxy.adm.constant.enums.AdmDictCategoryEnum;
-import com.persagy.proxy.adm.model.*;
+import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmDictQueryCriteria;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.IAdmDictService;
+import com.persagy.proxy.dictionary.service.IAdmDictService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.dictionary.model.AdmDefFuncIdGather;
+import com.persagy.proxy.dictionary.model.AdmDict;
+import com.persagy.proxy.dictionary.model.AdmDictBatch;
+import com.persagy.proxy.dictionary.model.AdmObjectType;
+import com.persagy.proxy.object.model.AdmObjectInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +53,7 @@ public class AdmDictController {
         if(StringUtils.isEmpty(request.getType())){
             throw new Exception("type不能为空");
         }
-        return service.queryCategory(context,request,AdmObjectType.class);
+        return service.queryCategory(context,request, AdmObjectType.class);
     }
 
 

+ 4 - 5
src/main/java/com/persagy/proxy/adm/controller/AdmLabslController.java

@@ -1,10 +1,9 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.dictionary.controller;
 
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.proxy.adm.model.AdmObjectInfo;
-import com.persagy.proxy.adm.model.AdmObjectType;
+import com.persagy.proxy.object.model.AdmObjectInfo;
+import com.persagy.proxy.dictionary.model.AdmObjectType;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.IAdmLabslService;
+import com.persagy.proxy.report.service.IAdmLabslService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;

+ 3 - 3
src/main/java/com/persagy/proxy/adm/controller/AdmModelController.java

@@ -1,11 +1,11 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.dictionary.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
-import com.persagy.proxy.adm.model.AdmModelKey;
+import com.persagy.proxy.dictionary.model.AdmModelKey;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.IAdmModelKeyService;
+import com.persagy.proxy.dictionary.service.IAdmModelKeyService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.InstanceUrlParam;

+ 5 - 7
src/main/java/com/persagy/proxy/adm/controller/AdmPlanarController.java

@@ -1,10 +1,10 @@
-package com.persagy.proxy.adm.controller;
+package com.persagy.proxy.dictionary.controller;
 
-import cn.hutool.core.collection.CollUtil;
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.proxy.adm.model.*;
+import com.persagy.proxy.object.model.AdmEquipment;
+import com.persagy.proxy.dictionary.model.AdmPlanarEquipRequests;
+import com.persagy.proxy.object.model.AdmSpace;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.IAdmPlanarService;
+import com.persagy.proxy.dictionary.service.IAdmPlanarService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;
@@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.ws.rs.QueryParam;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @ClassName AdmLabslController

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmDefFuncIdGather.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import lombok.Data;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmDict.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmDictBatch.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import lombok.Data;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmGraphicType.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import lombok.Data;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmModelKey.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import lombok.Data;
 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmModelRel.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Data;

+ 1 - 2
src/main/java/com/persagy/proxy/adm/model/AdmObjectType.java

@@ -1,8 +1,7 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

+ 1 - 2
src/main/java/com/persagy/proxy/adm/model/AdmPlanarEquipRequests.java

@@ -1,8 +1,7 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmRelationType.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.model;
+package com.persagy.proxy.dictionary.model;
 
 import lombok.Data;
 

+ 1 - 2
src/main/java/com/persagy/proxy/adm/service/IAdmDictBaseService.java

@@ -1,7 +1,6 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.dictionary.service;
 
 import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.proxy.adm.model.AdmDict;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.common.entity.InstanceUrlParam;

+ 4 - 4
src/main/java/com/persagy/proxy/adm/service/IAdmDictService.java

@@ -1,8 +1,8 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.dictionary.service;
 
-import com.persagy.proxy.adm.model.AdmDefFuncIdGather;
-import com.persagy.proxy.adm.model.AdmDict;
-import com.persagy.proxy.adm.model.AdmDictQueryCriteria;
+import com.persagy.proxy.dictionary.model.AdmDefFuncIdGather;
+import com.persagy.proxy.dictionary.model.AdmDict;
+import com.persagy.proxy.adm.request.AdmDictQueryCriteria;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.common.entity.InstanceUrlParam;

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

@@ -1,6 +1,7 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.dictionary.service;
 
-import com.persagy.proxy.adm.model.AdmGraphicType;
+import com.persagy.proxy.adm.service.IAdmBaseService;
+import com.persagy.proxy.dictionary.model.AdmGraphicType;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 
@@ -9,7 +10,7 @@ import com.persagy.proxy.common.entity.InstanceUrlParam;
  * @author lvxy
  * @date 2021/8/18
  */
-public interface IAdmGraphicTypeService extends IAdmBaseService<AdmGraphicType>{
+public interface IAdmGraphicTypeService extends IAdmBaseService<AdmGraphicType> {
 
 
     AdmResponse query(InstanceUrlParam context);

+ 1 - 1
src/main/java/com/persagy/proxy/adm/service/IAdmModelKeyService.java

@@ -1,4 +1,4 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.dictionary.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;

+ 4 - 4
src/main/java/com/persagy/proxy/adm/service/IAdmModelRelService.java

@@ -1,7 +1,7 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.dictionary.service;
 
-import com.persagy.proxy.adm.model.AdmLocationPoint;
-import com.persagy.proxy.adm.model.AdmModelRel;
+import com.persagy.proxy.adm.service.IAdmBaseService;
+import com.persagy.proxy.dictionary.model.AdmModelRel;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
  * @Date 2021/8/31 14:30
  * @Version V1.0
  **/
-public interface IAdmModelRelService extends IAdmBaseService<AdmModelRel>{
+public interface IAdmModelRelService extends IAdmBaseService<AdmModelRel> {
 
     /**
      * 修改

+ 4 - 4
src/main/java/com/persagy/proxy/adm/service/IAdmPlanarService.java

@@ -1,8 +1,8 @@
-package com.persagy.proxy.adm.service;
+package com.persagy.proxy.dictionary.service;
 
-import com.persagy.proxy.adm.model.AdmEquipment;
-import com.persagy.proxy.adm.model.AdmPlanarEquipRequests;
-import com.persagy.proxy.adm.model.AdmSpace;
+import com.persagy.proxy.object.model.AdmEquipment;
+import com.persagy.proxy.dictionary.model.AdmPlanarEquipRequests;
+import com.persagy.proxy.object.model.AdmSpace;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 

+ 0 - 0
src/main/java/com/persagy/proxy/dictionary/service/IAdmRelationTypeService.java


部分文件因为文件数量过多而无法显示