Browse Source

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/DiagramDataLoader.java
liyang 3 years ago
parent
commit
d4dbe5800e
100 changed files with 452 additions and 319 deletions
  1. 117 126
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/DiagramDataLoader.java
  2. 16 0
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/DiagramException.java
  3. 2 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/DefineInfoMigration.java
  4. 15 3
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/ObjectRelationMigration.java
  5. 3 3
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/aop/ExceptionAspect.java
  6. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/client/DicClient.java
  7. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/client/ImageServiceClient.java
  8. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/client/OldAdmClient.java
  9. 3 3
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/client/RwdClient.java
  10. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/common/AdmConst.java
  11. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/common/AdmMessageConst.java
  12. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/common/AdmRequest.java
  13. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/common/AdmResult.java
  14. 1 5
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/config/AdmCommonConfig.java
  15. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/config/AdmRabbitConfig.java
  16. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/config/TestConfig.java
  17. 6 6
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/AdmFileController.java
  18. 11 11
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/AppController.java
  19. 5 5
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/ManageController.java
  20. 13 11
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/ToolController.java
  21. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmCadMapper.java
  22. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmClientFlagMapper.java
  23. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmComponentMapper.java
  24. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmConfigMapper.java
  25. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmContainerConfigMapper.java
  26. 16 0
      adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/dao/AdmDefineProblemInfoMapper.java
  27. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmDefineProblemTypeMapper.java
  28. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmFileMapper.java
  29. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmInfosConfigMapper.java
  30. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmJobSpaceMapper.java
  31. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmM2dEquipMapper.java
  32. 2 3
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmMessagePMapper.java
  33. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmObjectMapper.java
  34. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmPipeConfigMapper.java
  35. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmPipeMapper.java
  36. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmProblemArchMapper.java
  37. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmProblemEquipMapper.java
  38. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmProblemMapper.java
  39. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmQrCodeMapper.java
  40. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmRelationMapper.java
  41. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmRelsConfigMapper.java
  42. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmServeAreaMapper.java
  43. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmUploadJobMapper.java
  44. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmUploadLogMapper.java
  45. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/datatx/DataTxHandler.java
  46. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/datatx/ObjectForTx.java
  47. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/datatx/ObjectMapper4Tx.java
  48. 2 3
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/AdmCad.java
  49. 101 0
      adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/entity/AdmDefineProblemInfo.java
  50. 2 4
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/AdmProblem.java
  51. 2 6
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/BuildingData.java
  52. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/CadFileInfo.java
  53. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/CadFileQueryParam.java
  54. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/D2mMessage.java
  55. 1 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/Dict.java
  56. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/DownLoadData.java
  57. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/InfoDef.java
  58. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/Pagination.java
  59. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/ProjectData.java
  60. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/TypeDef.java
  61. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/UploadData.java
  62. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/UploadRtn.java
  63. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmClientFlag.java
  64. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmComponent.java
  65. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmConfig.java
  66. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmContainerConfig.java
  67. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmDefineProblemType.java
  68. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmFile.java
  69. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmInfosConfig.java
  70. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmJobSpace.java
  71. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmM2dEquip.java
  72. 1 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmMessageP.java
  73. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmObject.java
  74. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmPipe.java
  75. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmPipeConfig.java
  76. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmProblemArch.java
  77. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmProblemEquip.java
  78. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmQrCode.java
  79. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmRelation.java
  80. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmRelsConfig.java
  81. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmServeArea.java
  82. 1 3
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmUploadJob.java
  83. 1 6
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmUploadLog.java
  84. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/BaseAdmDataEntity.java
  85. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/BaseAdmEntity.java
  86. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/BaseDeliveryEntity.java
  87. 1 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OBase.java
  88. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OBuilding.java
  89. 1 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OEquip.java
  90. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OFloor.java
  91. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OProject.java
  92. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OSpace.java
  93. 1 1
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OldAdmResult.java
  94. 5 5
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/handler/M2DMessageHandler.java
  95. 1 0
      adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/read.me
  96. 4 3
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/CallException.java
  97. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/IAdmCadService.java
  98. 16 0
      adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/service/IAdmDefineProblemInfoService.java
  99. 2 2
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/IAdmFileService.java
  100. 0 0
      adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/IAdmLogService.java

+ 117 - 126
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/DiagramDataLoader.java

@@ -14,144 +14,135 @@ import java.util.stream.Collectors;
 
 /**
  * 系统图数据加载
- *
  * @author zhaoyk
  */
 public class DiagramDataLoader {
 
-    private Diagram diagram;
-
-    private DataStrategy dataStrategy;
-
-    private List<ObjectNode> rels;
-
-    private List<ObjectNode> optionalObjs;
-
-    private List<ObjectNode> optionalRels;
-
-    public DiagramDataLoader(Diagram diagram, DataStrategy dataStrategy) {
-        this.diagram = diagram;
-        this.dataStrategy = dataStrategy;
-    }
-
-    /**
-     * 加载已经保存的数据
-     */
-    public void initLoad() {
-        List<String> objIds = diagram.getObjIds();
-        if (objIds.size() > 0) {
-            List<ObjectNode> objs = dataStrategy.loadObjectsById(objIds, diagram.getProjectId(), diagram.getGroupCode());
-            if (CollUtil.isNotEmpty(objs)) {
-                initNodes(objs);
-            }
-        }
-
-        List<String> relIds = diagram.getRelIds();
-        if (relIds.size() > 0) {
-            List<ObjectNode> rels = dataStrategy.loadRelationsById(relIds, diagram.getProjectId(), diagram.getGroupCode());
-            if (CollUtil.isNotEmpty(rels)) {
-                initLines(rels);
-            }
-        }
-    }
-
-    private void initNodes(List<ObjectNode> objs) {
-        HashMap<String, ObjectNode> objMap = new HashMap<>();
-        objs.forEach(obj -> objMap.put(obj.get("id").asText(), obj));
-
-        for (DiagramNode node : diagram.getNodes()) {
-            ObjectNode obj = null;
-            //设备节点
-            if (EquipmentNode.TYPE.equals(node.getCompType())) {
-                EquipmentNode en = (EquipmentNode) node;
-                obj = objMap.get(en.getObjId());
-
-                if (en.getLegendId() != null) {
-                    en.setLegend(dataStrategy.getLegend(en.getLegendId(), en.getObjSystemCode()));
-                } else {
-                    en.setLegend(DiagramBuilder.emptyLegend());
-                }
-            }
-
-            if (obj != null) {
-                node.setDataObject(obj);
-            }
-        }
-
-        //设备类干管
-        if (diagram.getTemplate().getMainPipes() != null) {
-            for (MainPipe mainPipe : diagram.getTemplate().getMainPipes()) {
-                if (mainPipe.isBindEquipment()) {
-                    ObjectNode obj = objMap.get(mainPipe.getDataObjectId());
-                    if (obj != null) {
-                        mainPipe.setDataObject(obj);
-                    }
-                }
-            }
-        }
-    }
-
-    private void initLines(List<ObjectNode> rels) {
-        HashMap<String, ObjectNode> relMap = new HashMap<>();
-        rels.forEach(obj -> relMap.put(obj.get("id").asText(), obj));
-
-        for (Line line : diagram.getLines()) {
-            if (line.getDataObjectId() != null) {
-                ObjectNode rel = relMap.get(line.getDataObjectId());
-                if (rel != null) {
-                    line.setDataObject(rel);
-                }
-            }
-        }
-    }
-
-    /**
-     * 搜索数据并自动加载
-     */
-    public void autoLoad(DiagramBuilder builder) {
-        //查询备选数据
-        HashSet<String> equipTypes = new HashSet<>();
-        List<Container> containers = diagram.getTemplate().getContainers();
-        for (Container con : containers) {
-            if (con.getEquipmentTypes() != null) {
-                equipTypes.addAll(con.getEquipmentTypes());
-            }
-        }
-        if (diagram.getTemplate().getMainPipes() != null) {
-            for (MainPipe mainPipe : diagram.getTemplate().getMainPipes()) {
-                //TODO 过滤已经初始化加载数据的干管
-                if (mainPipe.getEquipmentTypes() != null) {
-                    equipTypes.addAll(mainPipe.getEquipmentTypes());
-                }
-            }
-        }
-
-        //TODO 打包设备查询性能优化
-        if (equipTypes.size() > 0) {
+	private Diagram diagram;
+
+	private DataStrategy dataStrategy;
+
+	private List<ObjectNode> rels;
+
+	private List<ObjectNode> optionalObjs;
+
+	private List<ObjectNode> optionalRels;
+
+	public DiagramDataLoader(Diagram diagram, DataStrategy dataStrategy) {
+		this.diagram = diagram;
+		this.dataStrategy = dataStrategy;
+	}
+
+	/**
+	 * 加载已经保存的数据
+	 */
+	public void initLoad(){
+		List<String> objIds = diagram.getObjIds();
+		if(objIds.size() > 0) {
+			List<ObjectNode> objs = dataStrategy.loadObjectsById(objIds, diagram.getProjectId(), diagram.getGroupCode());
+			if(CollUtil.isNotEmpty(objs))
+				initNodes(objs);
+			else
+				throw new DiagramException("对象数据加载失败");
+		}
+
+		List<String> relIds = diagram.getRelIds();
+		if(relIds.size() > 0) {
+			List<ObjectNode> rels = dataStrategy.loadRelationsById(relIds, diagram.getProjectId(), diagram.getGroupCode());
+			if(CollUtil.isNotEmpty(rels))
+				initLines(rels);
+			else
+				throw new DiagramException("关系数据加载失败");
+		}
+	}
+
+	private void initNodes(List<ObjectNode> objs) {
+		HashMap<String, ObjectNode> objMap = new HashMap<>();
+		objs.forEach(obj -> objMap.put(obj.get("id").asText(), obj));
+
+		for (DiagramNode node : diagram.getNodes()) {
+			ObjectNode obj = null;
+
+			if(EquipmentNode.TYPE.equals(node.getCompType())) { //设备节点
+				EquipmentNode en = (EquipmentNode) node;
+				obj = objMap.get(en.getObjId());
+
+				if(en.getLegendId() != null)
+					en.setLegend(dataStrategy.getLegend(en.getLegendId(), en.getObjSystemCode()));
+				else
+					en.setLegend(DiagramBuilder.emptyLegend());
+			}
+
+			if(obj != null)
+				node.setDataObject(obj);
+		}
+
+		//设备类干管
+		if(diagram.getTemplate().getMainPipes() != null) {
+			for(MainPipe mainPipe : diagram.getTemplate().getMainPipes()) {
+				if(mainPipe.isBindEquipment()){
+					ObjectNode obj = objMap.get(mainPipe.getDataObjectId());
+					if(obj != null)
+						mainPipe.setDataObject(obj);
+				}
+			}
+		}
+	}
+
+	private void initLines(List<ObjectNode> rels){
+		HashMap<String, ObjectNode> relMap = new HashMap<>();
+		rels.forEach(obj -> relMap.put(obj.get("id").asText(), obj));
+
+		for(Line line : diagram.getLines()) {
+			if(line.getDataObjectId() != null){
+				ObjectNode rel = relMap.get(line.getDataObjectId());
+				if(rel != null)
+					line.setDataObject(rel);
+			}
+		}
+	}
+
+	/**
+	 * 搜索数据并自动加载
+	 */
+	public void autoLoad(DiagramBuilder builder) {
+		//查询备选数据
+		HashSet<String> equipTypes = new HashSet<>();
+		List<Container> containers = diagram.getTemplate().getContainers();
+		for(Container con : containers) {
+			if(con.getEquipmentTypes() != null)
+				equipTypes.addAll(con.getEquipmentTypes());
+		}
+		if(diagram.getTemplate().getMainPipes() != null) {
+			for(MainPipe mainPipe : diagram.getTemplate().getMainPipes()) {
+				if(mainPipe.getEquipmentTypes() != null) //TODO 过滤已经初始化加载数据的干管
+					equipTypes.addAll(mainPipe.getEquipmentTypes());
+			}
+		}
+
+		//TODO 打包设备查询性能优化
+		if(equipTypes.size() > 0)
 			optionalObjs = dataStrategy.loadObjectsByType(new ArrayList<>(equipTypes), diagram.getProjectId(), diagram.getSystemId(), diagram.getGroupCode());
-		} else {
+		else
 			optionalObjs = new ArrayList<>();
-		}
-        //记录备选对象id列表
-        List<String> objIds = optionalObjs.stream().map(obj -> obj.get("id").asText()).collect(Collectors.toList());
+		//记录备选对象id列表
+		List<String> objIds = optionalObjs.stream().map(obj -> obj.get("id").asText()).collect(Collectors.toList());
 
-        //去掉已经使用的数据项
-        HashMap<String, Object> equipMap = builder.getEquipMap();
-        if (equipMap.size() > 0) {
+		//去掉已经使用的数据项
+		HashMap<String, Object> equipMap = builder.getEquipMap();
+		if(equipMap.size() > 0)
 			optionalObjs = optionalObjs.stream().filter(obj -> !equipMap.containsKey(obj.get("id").asText())).collect(Collectors.toList());
-		}
 
-        builder.buildEquipNodeAndContainer(containers, optionalObjs);
-        List<String[]> relTypes = builder.getRefRelTypes().stream().map(type -> type.split("/")).collect(Collectors.toList());
+		builder.buildEquipNodeAndContainer(containers, optionalObjs);
+		List<String[]> relTypes = builder.getRefRelTypes().stream().map(type -> type.split("/")).collect(Collectors.toList());
 
-        //TODO 关系查询,需要区分打包设备
-        if (objIds.size() > 0 && relTypes.size() > 0) {
+		//TODO 关系查询,需要区分打包设备
+		if(objIds.size() > 0 && relTypes.size() > 0)
 			optionalRels = dataStrategy.loadRelationsByType(relTypes, objIds, diagram.getProjectId(), diagram.getGroupCode());
-		} else {
+		else
 			optionalRels = new ArrayList<>();
-		}
 
-        builder.buildLines(optionalRels);
-    }
+		builder.buildLines(optionalRels);
+	}
 
 }

+ 16 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/DiagramException.java

@@ -0,0 +1,16 @@
+package com.persagy.adm.diagram.core;
+
+/**
+ * 系统图运行时异常
+ */
+public class DiagramException extends RuntimeException {
+
+	public DiagramException(String message) {
+		super(message);
+	}
+
+	public DiagramException(String message, Exception cause) {
+		super(message, cause);
+	}
+
+}

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

@@ -156,7 +156,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
             sqls.append("'").append(infoDefine.getCategory()).append("',");
             sqls.append("'").append(infoDefine.getFirstTag()).append("',");
             if (infoDefine.getSecondTag() == null) {
-                infoDefine.getSecondTag();
+                sqls.append(infoDefine.getSecondTag()).append(",");
             } else {
                 sqls.append("'").append(infoDefine.getSecondTag()).append("',");
             }
@@ -196,7 +196,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
             sqls.append(infoDefine.getShowOrder()).append(",");
 
             if (infoDefine.getVersion() == null) {
-                infoDefine.getVersion();
+                sqls.append(infoDefine.getVersion()).append(",");
             } else {
                 sqls.append("'").append(infoDefine.getVersion()).append("',");
             }

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

@@ -233,14 +233,26 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
                 sqls.append("'").append(relation.getGraphId()).append("',");
             }
             sqls.append("'").append(relation.getGraphCode()).append("',");
-            sqls.append("'").append(relation.getRelCode()).append("',");;
+            sqls.append("'").append(relation.getRelCode()).append("',");
+
             if (relation.getRelValue() == null) {
                 sqls.append(relation.getRelValue()).append(",");
             } else {
                 sqls.append("'").append(relation.getRelValue()).append("',");
             }
-            sqls.append("'").append(relation.getObjFrom()).append("',");
-            sqls.append("'").append(relation.getObjTo()).append("',");
+
+            if (relation.getObjFrom() == null) {
+                sqls.append(relation.getObjFrom()).append(",");
+            } else {
+                sqls.append("'").append(relation.getObjFrom()).append("',");
+            }
+
+            if (relation.getObjTo() == null) {
+                sqls.append(relation.getObjTo()).append(",");
+            } else {
+                sqls.append("'").append(relation.getObjTo()).append("',");
+            }
+
             if (relation.getCreateApp() == null) {
                 sqls.append(relation.getCreateApp()).append(",");
             } else {

+ 3 - 3
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/aop/ExceptionAspect.java

@@ -1,6 +1,6 @@
-package com.persagy.bdtp.adm.aop;
+package com.persagy.adm.server.custom.aop;
 
-import com.persagy.bdtp.adm.service.CallException;
+import com.persagy.adm.server.custom.service.CallException;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 public class ExceptionAspect {
 
-    @Pointcut("execution(public * com.persagy.bdtp.adm.controller.AppController.*(..))")
+    @Pointcut("execution(public * com.persagy.adm.server.custom.controller.AppController.*(..))")
     public void handle(){
 
     }

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/client/DicClient.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.client;
+package com.persagy.adm.server.custom.client;
 
 import com.persagy.dmp.basic.config.DigitalFeignConfig;
 import com.persagy.dmp.basic.model.QueryCriteria;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/client/ImageServiceClient.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.client;
+package com.persagy.adm.server.custom.client;
 
 import com.persagy.dmp.basic.config.DigitalFeignConfig;
 import feign.Response;

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/client/OldAdmClient.java

@@ -1,6 +1,6 @@
-package com.persagy.bdtp.adm.client;
+package com.persagy.adm.server.custom.client;
 
-import com.persagy.bdtp.adm.entity.oldadm.*;
+import com.persagy.adm.server.custom.entity.oldadm.*;
 import com.persagy.dmp.basic.config.DigitalFeignConfig;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;

+ 3 - 3
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/client/RwdClient.java

@@ -1,8 +1,8 @@
-package com.persagy.bdtp.adm.client;
+package com.persagy.adm.server.custom.client;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.bdtp.adm.entity.InfoDef;
-import com.persagy.bdtp.adm.entity.TypeDef;
+import com.persagy.adm.server.custom.entity.InfoDef;
+import com.persagy.adm.server.custom.entity.TypeDef;
 import com.persagy.dmp.basic.config.DigitalFeignConfig;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.model.response.CommonResult;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/common/AdmConst.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.common;
+package com.persagy.adm.server.custom.common;
 
 public interface AdmConst {
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/common/AdmMessageConst.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.common;
+package com.persagy.adm.server.custom.common;
 
 public interface AdmMessageConst {
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/common/AdmRequest.java

@@ -1,6 +1,6 @@
-package com.persagy.bdtp.adm.common;
+package com.persagy.adm.server.custom.common;
 
-import com.persagy.bdtp.adm.entity.UploadData;
+import com.persagy.adm.server.custom.entity.UploadData;
 import lombok.Data;
 
 @Data

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/common/AdmResult.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.common;
+package com.persagy.adm.server.custom.common;
 
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.model.response.CommonResult;

+ 1 - 5
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/config/AdmCommonConfig.java

@@ -1,9 +1,5 @@
-package com.persagy.bdtp.adm.config;
+package com.persagy.adm.server.custom.config;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/config/AdmRabbitConfig.java

@@ -1,6 +1,6 @@
-package com.persagy.bdtp.adm.config;
+package com.persagy.adm.server.custom.config;
 
-import com.persagy.bdtp.adm.common.AdmMessageConst;
+import com.persagy.adm.server.custom.common.AdmMessageConst;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/config/TestConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.config;
+package com.persagy.adm.server.custom.config;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

+ 6 - 6
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/AdmFileController.java

@@ -1,13 +1,13 @@
-package com.persagy.bdtp.adm.controller;
+package com.persagy.adm.server.custom.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.persagy.bdtp.adm.common.AdmResult;
-import com.persagy.bdtp.adm.dao.AdmFileMapper;
-import com.persagy.bdtp.adm.entity.AdmCad;
-import com.persagy.bdtp.adm.entity.CadFileQueryParam;
-import com.persagy.bdtp.adm.service.IAdmCadService;
+import com.persagy.adm.server.custom.common.AdmResult;
+import com.persagy.adm.server.custom.dao.AdmFileMapper;
+import com.persagy.adm.server.custom.entity.AdmCad;
+import com.persagy.adm.server.custom.entity.CadFileQueryParam;
+import com.persagy.adm.server.custom.service.IAdmCadService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 11 - 11
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/AppController.java

@@ -1,16 +1,16 @@
-package com.persagy.bdtp.adm.controller;
+package com.persagy.adm.server.custom.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.persagy.bdtp.adm.client.ImageServiceClient;
-import com.persagy.bdtp.adm.client.OldAdmClient;
-import com.persagy.bdtp.adm.common.AdmRequest;
-import com.persagy.bdtp.adm.common.AdmResult;
-import com.persagy.bdtp.adm.datatx.DataTxHandler;
-import com.persagy.bdtp.adm.entity.Dict;
-import com.persagy.bdtp.adm.entity.DownLoadData;
-import com.persagy.bdtp.adm.entity.UploadRtn;
-import com.persagy.bdtp.adm.service.ISyncApp;
-import com.persagy.bdtp.adm.service.ServiceUtil;
+import com.persagy.adm.server.custom.client.ImageServiceClient;
+import com.persagy.adm.server.custom.client.OldAdmClient;
+import com.persagy.adm.server.custom.common.AdmRequest;
+import com.persagy.adm.server.custom.common.AdmResult;
+import com.persagy.adm.server.custom.datatx.DataTxHandler;
+import com.persagy.adm.server.custom.entity.Dict;
+import com.persagy.adm.server.custom.entity.DownLoadData;
+import com.persagy.adm.server.custom.entity.UploadRtn;
+import com.persagy.adm.server.custom.service.ISyncApp;
+import com.persagy.adm.server.custom.service.ServiceUtil;
 import feign.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

+ 5 - 5
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/ManageController.java

@@ -1,9 +1,9 @@
-package com.persagy.bdtp.adm.controller;
+package com.persagy.adm.server.custom.controller;
 
-import com.persagy.bdtp.adm.common.AdmRequest;
-import com.persagy.bdtp.adm.common.AdmResult;
-import com.persagy.bdtp.adm.service.ISyncOldAdm;
-import com.persagy.bdtp.adm.service.ISyncSpace;
+import com.persagy.adm.server.custom.common.AdmRequest;
+import com.persagy.adm.server.custom.common.AdmResult;
+import com.persagy.adm.server.custom.service.ISyncOldAdm;
+import com.persagy.adm.server.custom.service.ISyncSpace;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;

+ 13 - 11
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/ToolController.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.controller;
+package com.persagy.adm.server.custom.controller;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
@@ -8,16 +8,18 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.bdtp.adm.client.RwdClient;
-import com.persagy.bdtp.adm.common.AdmConst;
-import com.persagy.bdtp.adm.common.AdmRequest;
-import com.persagy.bdtp.adm.common.AdmResult;
-import com.persagy.bdtp.adm.dao.*;
-import com.persagy.bdtp.adm.entity.*;
-import com.persagy.bdtp.adm.entity.db.*;
-import com.persagy.bdtp.adm.service.IConfigService;
-import com.persagy.bdtp.adm.service.ISyncApp;
-import com.persagy.bdtp.adm.service.ServiceUtil;
+import com.persagy.adm.server.custom.client.RwdClient;
+import com.persagy.adm.server.custom.common.AdmConst;
+import com.persagy.adm.server.custom.common.AdmRequest;
+import com.persagy.adm.server.custom.common.AdmResult;
+import com.persagy.adm.server.custom.dao.*;
+import com.persagy.adm.server.custom.entity.Dict;
+import com.persagy.adm.server.custom.entity.InfoDef;
+import com.persagy.adm.server.custom.entity.TypeDef;
+import com.persagy.adm.server.custom.entity.db.*;
+import com.persagy.adm.server.custom.service.IConfigService;
+import com.persagy.adm.server.custom.service.ISyncApp;
+import com.persagy.adm.server.custom.service.ServiceUtil;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmCadMapper.java

@@ -1,6 +1,6 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
-import com.persagy.bdtp.adm.entity.AdmCad;
+import com.persagy.adm.server.custom.entity.AdmCad;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmClientFlagMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmClientFlag;
+import com.persagy.adm.server.custom.entity.db.AdmClientFlag;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmComponentMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmComponent;
+import com.persagy.adm.server.custom.entity.db.AdmComponent;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmConfigMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmConfig;
+import com.persagy.adm.server.custom.entity.db.AdmConfig;
 
 public interface AdmConfigMapper extends BaseMapper<AdmConfig> {
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmContainerConfigMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmContainerConfig;
+import com.persagy.adm.server.custom.entity.db.AdmContainerConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 16 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/dao/AdmDefineProblemInfoMapper.java

@@ -0,0 +1,16 @@
+package com.persagy.adm.server.custom.dao;
+
+import com.persagy.adm.server.custom.entity.AdmDefineProblemInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 核查问题信息点定义表 Mapper 接口
+ * </p>
+ *
+ * @author yanguofeng
+ * @since 2022-01-12
+ */
+public interface AdmDefineProblemInfoMapper extends BaseMapper<AdmDefineProblemInfo> {
+
+}

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmDefineProblemTypeMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmDefineProblemType;
+import com.persagy.adm.server.custom.entity.db.AdmDefineProblemType;
 
 public interface AdmDefineProblemTypeMapper extends BaseMapper<AdmDefineProblemType> {
 }

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmFileMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmFile;
+import com.persagy.adm.server.custom.entity.db.AdmFile;
 
 /**
  * <p>

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmInfosConfigMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmInfosConfig;
+import com.persagy.adm.server.custom.entity.db.AdmInfosConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmJobSpaceMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmJobSpace;
+import com.persagy.adm.server.custom.entity.db.AdmJobSpace;
 
 public interface AdmJobSpaceMapper extends BaseMapper<AdmJobSpace> {
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmM2dEquipMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmM2dEquip;
+import com.persagy.adm.server.custom.entity.db.AdmM2dEquip;
 
 public interface AdmM2dEquipMapper extends BaseMapper<AdmM2dEquip> {
 

+ 2 - 3
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmMessagePMapper.java

@@ -1,8 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmJobSpace;
-import com.persagy.bdtp.adm.entity.db.AdmMessageP;
+import com.persagy.adm.server.custom.entity.db.AdmMessageP;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmObjectMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmObject;
+import com.persagy.adm.server.custom.entity.db.AdmObject;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmPipeConfigMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmPipeConfig;
+import com.persagy.adm.server.custom.entity.db.AdmPipeConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmPipeMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmPipe;
+import com.persagy.adm.server.custom.entity.db.AdmPipe;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmProblemArchMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmProblemArch;
+import com.persagy.adm.server.custom.entity.db.AdmProblemArch;
 
 public interface AdmProblemArchMapper extends BaseMapper<AdmProblemArch> {
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmProblemEquipMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmProblemEquip;
+import com.persagy.adm.server.custom.entity.db.AdmProblemEquip;
 
 public interface AdmProblemEquipMapper extends BaseMapper<AdmProblemEquip> {
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmProblemMapper.java

@@ -1,6 +1,6 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
-import com.persagy.bdtp.adm.entity.AdmProblem;
+import com.persagy.adm.server.custom.entity.AdmProblem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmQrCodeMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmQrCode;
+import com.persagy.adm.server.custom.entity.db.AdmQrCode;
 
 public interface AdmQrCodeMapper extends BaseMapper<AdmQrCode> {
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmRelationMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmRelation;
+import com.persagy.adm.server.custom.entity.db.AdmRelation;
 
 public interface AdmRelationMapper extends BaseMapper<AdmRelation> {
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmRelsConfigMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmRelsConfig;
+import com.persagy.adm.server.custom.entity.db.AdmRelsConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmServeAreaMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmServeArea;
+import com.persagy.adm.server.custom.entity.db.AdmServeArea;
 
 public interface AdmServeAreaMapper extends BaseMapper<AdmServeArea> {
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmUploadJobMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmUploadJob;
+import com.persagy.adm.server.custom.entity.db.AdmUploadJob;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/dao/AdmUploadLogMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.dao;
+package com.persagy.adm.server.custom.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.bdtp.adm.entity.db.AdmUploadLog;
+import com.persagy.adm.server.custom.entity.db.AdmUploadLog;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/datatx/DataTxHandler.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.datatx;
+package com.persagy.adm.server.custom.datatx;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.persagy.bdtp.adm.common.AdmRequest;
+import com.persagy.adm.server.custom.common.AdmRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/datatx/ObjectForTx.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.datatx;
+package com.persagy.adm.server.custom.datatx;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/datatx/ObjectMapper4Tx.java

@@ -1,10 +1,10 @@
-package com.persagy.bdtp.adm.datatx;
+package com.persagy.adm.server.custom.datatx;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.persagy.bdtp.adm.entity.db.AdmObject;
+import com.persagy.adm.server.custom.entity.db.AdmObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

+ 2 - 3
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/AdmCad.java

@@ -1,10 +1,9 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
-import com.persagy.bdtp.adm.entity.db.BaseAdmDataEntity;
+import com.persagy.adm.server.custom.entity.db.BaseAdmDataEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 101 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/entity/AdmDefineProblemInfo.java

@@ -0,0 +1,101 @@
+package com.persagy.adm.server.custom.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 核查问题信息点定义表
+ * </p>
+ *
+ * @author yanguofeng
+ * @since 2022-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdmDefineProblemInfo implements Serializable {
+
+
+    private String id;
+
+    /**
+     * 信息点编码,同类型下唯一,标准驼峰格式
+     */
+    private String code;
+
+    /**
+     * 信息点名称
+     */
+    private String name;
+
+    /**
+     * 问题类型编码
+     */
+    @TableField("problem_type_code")
+    private String problemTypeCode;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 数据类型
+     */
+    @TableField("data_type")
+    private String dataType;
+
+    /**
+     * 是否复数
+     */
+    @TableField("is_multiple")
+    private Integer isMultiple;
+
+    /**
+     * 数据源取值范围/枚举值清单等,根据dataType有不同的内容
+     */
+    @TableField("data_source")
+    private String dataSource;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    @TableField("creation_time")
+    private String creationTime;
+
+    /**
+     * 最后修改人
+     */
+    private String modifier;
+
+    /**
+     * 最后修改时间
+     */
+    @TableField("modified_time")
+    private String modifiedTime;
+
+    /**
+     * 合法标识
+     */
+    private Integer valid;
+
+    /**
+     * 乐观锁
+     */
+    private LocalDateTime ts;
+
+
+}

+ 2 - 4
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/AdmProblem.java

@@ -1,11 +1,9 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
-import com.persagy.bdtp.adm.entity.db.BaseAdmDataEntity;
-import com.persagy.bdtp.adm.entity.db.BaseAdmEntity;
+import com.persagy.adm.server.custom.entity.db.BaseAdmDataEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 2 - 6
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/BuildingData.java

@@ -1,10 +1,6 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
-import cn.hutool.core.collection.CollUtil;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.bdtp.adm.entity.db.*;
-import com.persagy.dmp.common.model.entity.BaseEntity;
-import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.adm.server.custom.entity.db.*;
 import lombok.Data;
 
 import java.util.List;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/CadFileInfo.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import lombok.Data;
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/CadFileQueryParam.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import lombok.Data;
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/D2mMessage.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;

+ 1 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/Dict.java

@@ -1,6 +1,5 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
-import com.persagy.dmp.define.entity.RelationDefine;
 import lombok.Data;
 
 import java.util.List;

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/DownLoadData.java

@@ -1,8 +1,8 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.bdtp.adm.entity.db.BaseAdmDataEntity;
+import com.persagy.adm.server.custom.entity.db.BaseAdmDataEntity;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/InfoDef.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/Pagination.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import lombok.Data;
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/ProjectData.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import lombok.Data;
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/TypeDef.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import lombok.Data;

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/UploadData.java

@@ -1,8 +1,8 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.bdtp.adm.entity.db.*;
+import com.persagy.adm.server.custom.entity.db.*;
 import lombok.Data;
 
 import java.util.List;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/UploadRtn.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity;
+package com.persagy.adm.server.custom.entity;
 
 import lombok.Data;
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmClientFlag.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmComponent.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmContainerConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmDefineProblemType.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmFile.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmInfosConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmJobSpace.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmM2dEquip.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+ 1 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmMessageP.java

@@ -1,9 +1,8 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 
 import java.sql.Timestamp;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmObject.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmPipe.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmPipeConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmProblemArch.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmProblemEquip.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmQrCode.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmRelation.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmRelsConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmServeArea.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 3
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmUploadJob.java

@@ -1,7 +1,5 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 

+ 1 - 6
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmUploadLog.java

@@ -1,11 +1,6 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
-import cn.hutool.extra.spring.SpringUtil;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/BaseAdmDataEntity.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.core.JsonGenerator;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/BaseAdmEntity.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import lombok.Data;
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/BaseDeliveryEntity.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.db;
+package com.persagy.adm.server.custom.entity.db;
 
 import lombok.Data;
 

+ 1 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OBase.java

@@ -1,8 +1,7 @@
-package com.persagy.bdtp.adm.entity.oldadm;
+package com.persagy.adm.server.custom.entity.oldadm;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.util.Map;
 
 @Data

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OBuilding.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.oldadm;
+package com.persagy.adm.server.custom.entity.oldadm;
 
 import lombok.Data;
 

+ 1 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OEquip.java

@@ -1,8 +1,7 @@
-package com.persagy.bdtp.adm.entity.oldadm;
+package com.persagy.adm.server.custom.entity.oldadm;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Data;
 
 import java.util.List;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OFloor.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.oldadm;
+package com.persagy.adm.server.custom.entity.oldadm;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OProject.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.oldadm;
+package com.persagy.adm.server.custom.entity.oldadm;
 
 import lombok.Data;
 

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OSpace.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.oldadm;
+package com.persagy.adm.server.custom.entity.oldadm;
 
 import cn.hutool.core.map.CaseInsensitiveMap;
 import lombok.Data;

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/oldadm/OldAdmResult.java

@@ -1,4 +1,4 @@
-package com.persagy.bdtp.adm.entity.oldadm;
+package com.persagy.adm.server.custom.entity.oldadm;
 
 import lombok.Data;
 

+ 5 - 5
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/handler/M2DMessageHandler.java

@@ -1,10 +1,10 @@
-package com.persagy.bdtp.adm.handler;
+package com.persagy.adm.server.custom.handler;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.persagy.bdtp.adm.common.AdmConst;
-import com.persagy.bdtp.adm.common.AdmMessageConst;
-import com.persagy.bdtp.adm.dao.AdmMessagePMapper;
-import com.persagy.bdtp.adm.entity.db.AdmMessageP;
+import com.persagy.adm.server.custom.common.AdmConst;
+import com.persagy.adm.server.custom.common.AdmMessageConst;
+import com.persagy.adm.server.custom.dao.AdmMessagePMapper;
+import com.persagy.adm.server.custom.entity.db.AdmMessageP;
 import com.persagy.dmp.amqp.handler.AbstractRabbitHandlerTemplate;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/read.me

@@ -0,0 +1 @@
+主要提供web和app端服务

+ 4 - 3
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/CallException.java

@@ -1,6 +1,7 @@
-package com.persagy.bdtp.adm.service;
+package com.persagy.adm.server.custom.service;
 
-import com.persagy.bdtp.adm.common.AdmResult;
+
+import com.persagy.adm.server.custom.common.AdmResult;
 
 public class CallException extends RuntimeException {
 
@@ -10,7 +11,7 @@ public class CallException extends RuntimeException {
 		this.errorResult = errorResult;
 	}
 
-	public AdmResult<Object> getErrorResult() {
+	public  AdmResult<Object> getErrorResult() {
 		return errorResult;
 	}
 

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/IAdmCadService.java

@@ -1,6 +1,6 @@
-package com.persagy.bdtp.adm.service;
+package com.persagy.adm.server.custom.service;
 
-import com.persagy.bdtp.adm.entity.AdmCad;
+import com.persagy.adm.server.custom.entity.AdmCad;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 16 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/service/IAdmDefineProblemInfoService.java

@@ -0,0 +1,16 @@
+package com.persagy.adm.server.custom.service;
+
+import com.persagy.adm.server.custom.entity.AdmDefineProblemInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 核查问题信息点定义表 服务类
+ * </p>
+ *
+ * @author yanguofeng
+ * @since 2022-01-12
+ */
+public interface IAdmDefineProblemInfoService extends IService<AdmDefineProblemInfo> {
+
+}

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/IAdmFileService.java

@@ -1,7 +1,7 @@
-package com.persagy.bdtp.adm.service;
+package com.persagy.adm.server.custom.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.persagy.bdtp.adm.entity.db.AdmFile;
+import com.persagy.adm.server.custom.entity.db.AdmFile;
 
 /**
  * <p>

+ 0 - 0
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/IAdmLogService.java


Some files were not shown because too many files changed in this diff