瀏覽代碼

微服务名称调整

linhuili 3 年之前
父節點
當前提交
3f987d5a02
共有 100 個文件被更改,包括 336 次插入348 次删除
  1. 0 4
      dc-cloud/dc-file/src/main/resources/rebel-remote.xml
  2. 0 4
      dc-cloud/dc-message/src/main/resources/rebel-remote.xml
  3. 0 0
      dmp-business/README.md
  4. 0 0
      dmp-business/dmp-dic/README.md
  5. 5 5
      dc-cloud/dc-file/pom.xml
  6. 8 9
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/controller/DictDataController.java
  7. 7 8
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/controller/DictTypeController.java
  8. 2 2
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/dao/DictDataMapper.java
  9. 2 2
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/dao/DictTypeMapper.java
  10. 2 2
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/entity/DictData.java
  11. 2 2
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/entity/DictType.java
  12. 2 2
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/service/DictDataService.java
  13. 2 2
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/service/DictTypeService.java
  14. 4 5
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/service/impl/DictDataServiceImpl.java
  15. 5 5
      dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/service/impl/DictTypeServiceImpl.java
  16. 1 1
      dc-business/dc-knowledge/src/main/resources/bootstrap.yml
  17. 0 0
      dmp-business/dmp-dic/src/main/resources/db.init/data.sql
  18. 0 0
      dmp-business/dmp-dic/src/main/resources/db.init/schema.sql
  19. 1 1
      dc-business/dc-digital/src/main/resources/mapper/DictDataMapper.xml
  20. 0 0
      dmp-business/dmp-rwd-version/README.md
  21. 4 4
      dc-business/dc-digital-version/pom.xml
  22. 1 1
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/constant/VersionOperator.java
  23. 1 1
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/constant/VersionOperatorLevel.java
  24. 1 1
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/constant/VersionState.java
  25. 7 7
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/controller/VersionDefineController.java
  26. 2 2
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/dao/ObjectInfoHistoryMapper.java
  27. 2 2
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/dao/ObjectTypeHistoryMapper.java
  28. 2 2
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/dao/VersionDefineMapper.java
  29. 2 2
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/ObjectInfo.java
  30. 1 1
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/ObjectInfoHistory.java
  31. 2 2
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/ObjectType.java
  32. 1 1
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/ObjectTypeHistory.java
  33. 3 3
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/VersionDefine.java
  34. 2 2
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/IObjectInfoHistoryService.java
  35. 2 2
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/IObjectTypeHistoryService.java
  36. 2 2
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/IVersionDefineService.java
  37. 6 6
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/impl/ObjectInfoHistoryServiceImpl.java
  38. 6 6
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/impl/ObjectTypeHistoryServiceImpl.java
  39. 9 9
      dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/impl/VersionDefineServiceImpl.java
  40. 1 1
      dc-business/dc-digital-version/src/main/resources/bootstrap.yml
  41. 0 0
      dmp-business/dmp-rwd-version/src/main/resources/db.init/data.sql
  42. 0 0
      dmp-business/dmp-rwd-version/src/main/resources/db.init/schema.sql
  43. 1 1
      dc-business/dc-digital-version/src/main/resources/mapper/ObjectInfoHistoryMapper.xml
  44. 1 2
      dc-business/dc-digital-version/src/main/resources/mapper/ObjectTypeHistoryMapper.xml
  45. 0 0
      dmp-business/dmp-rwd/README.md
  46. 6 6
      dc-business/dc-digital/pom.xml
  47. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalDataCategory.java
  48. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalDataType.java
  49. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalMessageConstant.java
  50. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalObjectType.java
  51. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalObjectTypeShort.java
  52. 6 6
      dc-business/dc-digital/src/main/java/com/persagy/dc/basic/utils/DigitalCommonUtils.java
  53. 5 5
      dc-business/dc-digital/src/main/java/com/persagy/dc/basic/utils/DigitalMessageHelper.java
  54. 3 3
      dc-business/dc-digital/src/main/java/com/persagy/dc/basic/utils/QueryCriteriaHelper.java
  55. 10 10
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/GraphDefineController.java
  56. 11 11
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/ObjectInfoController.java
  57. 11 11
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/ObjectTypeController.java
  58. 12 12
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/RelationDefineController.java
  59. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/dao/GraphDefineMapper.java
  60. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/dao/ObjectInfoMapper.java
  61. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/dao/ObjectTypeMapper.java
  62. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/dao/RelationDefineMapper.java
  63. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/IGraphDefineService.java
  64. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/IObjectInfoService.java
  65. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/IObjectTypeService.java
  66. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/IRelationDefineService.java
  67. 5 5
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/impl/GraphDefineServiceImpl.java
  68. 10 10
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/impl/ObjectInfoServiceImpl.java
  69. 10 10
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/impl/ObjectTypeServiceImpl.java
  70. 5 5
      dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/impl/RelationDefineServiceImpl.java
  71. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/config/DigitalRabbitConfig.java
  72. 11 11
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/controller/ObjectDigitalController.java
  73. 11 11
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/controller/ObjectRelationController.java
  74. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/dao/ObjectDigitalMapper.java
  75. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/dao/ObjectRelationMapper.java
  76. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/entity/ObjectDigital.java
  77. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/entity/ObjectRelation.java
  78. 9 9
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/handler/ProjectMessageHandler.java
  79. 4 4
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/handler/ProjectMessageVO.java
  80. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/service/IObjectDigitalService.java
  81. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/service/IObjectRelationService.java
  82. 12 12
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/service/impl/ObjectDigitalServiceImpl.java
  83. 5 5
      dc-business/dc-digital/src/main/java/com/persagy/dc/digital/service/impl/ObjectRelationServiceImpl.java
  84. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/entity/EnumVO.java
  85. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/entity/ParserResult.java
  86. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/entity/RegionVO.java
  87. 3 3
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/IInfoDataParser.java
  88. 6 6
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/InfoDataFactory.java
  89. 9 9
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/AbstractInfoDataParser.java
  90. 3 3
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/AttachmentInfoParser.java
  91. 3 3
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/BooleanInfoParser.java
  92. 5 5
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/DateInfoParser.java
  93. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/DoubleInfoParser.java
  94. 4 4
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/EnumInfoParser.java
  95. 1 1
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/IntegerInfoParser.java
  96. 5 5
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/NumberInfoParser.java
  97. 5 5
      dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/StringInfoParser.java
  98. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/subscribe/entity/SubscribeObjectInfo.java
  99. 2 2
      dc-business/dc-digital/src/main/java/com/persagy/dc/subscribe/entity/SubscribeObjectType.java
  100. 0 0
      dc-business/dc-digital/src/main/java/com/persagy/dc/subscribe/entity/SubscribeProject.java

+ 0 - 4
dc-cloud/dc-file/src/main/resources/rebel-remote.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rebel-remote xmlns="http://www.zeroturnaround.com/rebel/remote">
-    <id>com.persagy.dc-file</id>
-</rebel-remote>

+ 0 - 4
dc-cloud/dc-message/src/main/resources/rebel-remote.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rebel-remote xmlns="http://www.zeroturnaround.com/rebel/remote">
-    <id>com.persagy.dc-file</id>
-</rebel-remote>

dc-business/README.md → dmp-business/README.md


dc-business/dc-knowledge/README.md → dmp-business/dmp-dic/README.md


+ 5 - 5
dc-cloud/dc-file/pom.xml

@@ -3,12 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>dc-cloud</artifactId>
+        <artifactId>dmp-business</artifactId>
         <groupId>com.persagy</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>dc-file</artifactId>
+    <artifactId>dmp-dic</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -20,15 +20,15 @@
         <!-- 项目启动 -->
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-server</artifactId>
+            <artifactId>dmp-server</artifactId>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-mybatis</artifactId>
+            <artifactId>dmp-mybatis</artifactId>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-file-starter</artifactId>
+            <artifactId>dmp-common</artifactId>
         </dependency>
     </dependencies>
 </project>

+ 8 - 9
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/controller/DictDataController.java

@@ -1,13 +1,12 @@
-package com.persagy.dc.dic.controller;
+package com.persagy.dmp.dic.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.model.response.PageList;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.dic.entity.DictData;
-import com.persagy.dc.dic.service.DictDataService;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.model.response.PageList;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.dic.entity.DictData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +25,7 @@ import java.util.List;
 public class DictDataController {
 
     @Autowired
-    private DictDataService DictDataService;
+    private com.persagy.dmp.dic.service.DictDataService DictDataService;
 
     @PostMapping("/create")
     public CommonResult<DictData> create(@RequestBody DictData DictData) {

+ 7 - 8
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/controller/DictTypeController.java

@@ -1,13 +1,12 @@
-package com.persagy.dc.dic.controller;
+package com.persagy.dmp.dic.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.dic.entity.DictType;
-import com.persagy.dc.dic.service.DictTypeService;
-import org.apache.commons.lang.StringUtils;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.dic.entity.DictType;
+import com.persagy.dmp.dic.service.DictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 2 - 2
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/dao/DictDataMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.dic.dao;
+package com.persagy.dmp.dic.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.dic.entity.DictData;
+import com.persagy.dmp.dic.entity.DictData;
 
 /**
  * 字典数据

+ 2 - 2
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/dao/DictTypeMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.dic.dao;
+package com.persagy.dmp.dic.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.dic.entity.DictType;
+import com.persagy.dmp.dic.entity.DictType;
 
 /**
  * 字典类型

+ 2 - 2
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/entity/DictData.java

@@ -1,9 +1,9 @@
-package com.persagy.dc.dic.entity;
+package com.persagy.dmp.dic.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.dc.common.lang.PsDateTime;
+import com.persagy.dmp.common.lang.PsDateTime;
 import lombok.*;
 import lombok.experimental.Accessors;
 

+ 2 - 2
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/entity/DictType.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.dic.entity;
+package com.persagy.dmp.dic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.dc.common.model.entity.AuditableEntity;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 
 /**

+ 2 - 2
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/service/DictDataService.java

@@ -1,6 +1,6 @@
-package com.persagy.dc.dic.service;
+package com.persagy.dmp.dic.service;
 
-import com.persagy.dc.dic.entity.DictData;
+import com.persagy.dmp.dic.entity.DictData;
 
 import java.util.List;
 

+ 2 - 2
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/service/DictTypeService.java

@@ -1,6 +1,6 @@
-package com.persagy.dc.dic.service;
+package com.persagy.dmp.dic.service;
 
-import com.persagy.dc.dic.entity.DictType;
+import com.persagy.dmp.dic.entity.DictType;
 
 import java.util.List;
 

+ 4 - 5
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/service/impl/DictDataServiceImpl.java

@@ -1,8 +1,7 @@
-package com.persagy.dc.dic.service.impl;
+package com.persagy.dmp.dic.service.impl;
 
-import com.persagy.dc.dic.dao.DictDataMapper;
-import com.persagy.dc.dic.entity.DictData;
-import com.persagy.dc.dic.service.DictDataService;
+import com.persagy.dmp.dic.entity.DictData;
+import com.persagy.dmp.dic.service.DictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +16,7 @@ import java.util.List;
 public class DictDataServiceImpl implements DictDataService {
 
     @Autowired
-    private DictDataMapper DictDataMapper;
+    private com.persagy.dmp.dic.dao.DictDataMapper DictDataMapper;
 
 
     @Override

+ 5 - 5
dc-business/dc-knowledge/src/main/java/com/persagy/dc/dic/service/impl/DictTypeServiceImpl.java

@@ -1,10 +1,10 @@
-package com.persagy.dc.dic.service.impl;
+package com.persagy.dmp.dic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.dic.dao.DictTypeMapper;
-import com.persagy.dc.dic.entity.DictType;
-import com.persagy.dc.dic.service.DictTypeService;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.dic.dao.DictTypeMapper;
+import com.persagy.dmp.dic.entity.DictType;
+import com.persagy.dmp.dic.service.DictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
dc-business/dc-knowledge/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: dc-dic
+    name: dmp-dic
 
 config:
   file:

dc-business/dc-digital-version/src/main/resources/db.init/data.sql → dmp-business/dmp-dic/src/main/resources/db.init/data.sql


dc-business/dc-digital-version/src/main/resources/db.init/schema.sql → dmp-business/dmp-dic/src/main/resources/db.init/schema.sql


+ 1 - 1
dc-business/dc-digital/src/main/resources/mapper/DictDataMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.persagy.dc.dic.dao.DictDataMapper">
+<mapper namespace="com.persagy.dmp.dic.dao.DictDataMapper">
 
 </mapper>

dc-business/dc-digital-version/README.md → dmp-business/dmp-rwd-version/README.md


+ 4 - 4
dc-business/dc-digital-version/pom.xml

@@ -3,12 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>dc-business</artifactId>
+        <artifactId>dmp-business</artifactId>
         <groupId>com.persagy</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>dc-digital-version</artifactId>
+    <artifactId>dmp-rwd-version</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -20,11 +20,11 @@
         <!-- 项目启动 -->
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-server</artifactId>
+            <artifactId>dmp-server</artifactId>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-mybatis</artifactId>
+            <artifactId>dmp-mybatis</artifactId>
         </dependency>
     </dependencies>
 </project>

+ 1 - 1
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/constant/VersionOperator.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.dictionary.constant;
+package com.persagy.dmp.version.constant;
 
 import lombok.Getter;
 

+ 1 - 1
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/constant/VersionOperatorLevel.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.dictionary.constant;
+package com.persagy.dmp.version.constant;
 
 import lombok.Getter;
 

+ 1 - 1
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/constant/VersionState.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.dictionary.constant;
+package com.persagy.dmp.version.constant;
 
 import lombok.Getter;
 

+ 7 - 7
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/controller/VersionDefineController.java

@@ -1,12 +1,12 @@
-package com.persagy.dc.dictionary.controller;
+package com.persagy.dmp.version.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.dictionary.entity.VersionDefine;
-import com.persagy.dc.dictionary.service.IVersionDefineService;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.version.entity.VersionDefine;
+import com.persagy.dmp.version.service.IVersionDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 2 - 2
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/dao/ObjectInfoHistoryMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.dictionary.dao;
+package com.persagy.dmp.version.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.dictionary.entity.ObjectInfoHistory;
+import com.persagy.dmp.version.entity.ObjectInfoHistory;
 import org.apache.ibatis.annotations.Param;
 
 /**

+ 2 - 2
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/dao/ObjectTypeHistoryMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.dictionary.dao;
+package com.persagy.dmp.version.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.dictionary.entity.ObjectTypeHistory;
+import com.persagy.dmp.version.entity.ObjectTypeHistory;
 import org.apache.ibatis.annotations.Param;
 
 /**

+ 2 - 2
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/dao/VersionDefineMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.dictionary.dao;
+package com.persagy.dmp.version.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.dictionary.entity.VersionDefine;
+import com.persagy.dmp.version.entity.VersionDefine;
 
 /**
  * 版本定义dao

+ 2 - 2
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/ObjectInfo.java

@@ -1,6 +1,6 @@
-package com.persagy.dc.dictionary.entity;
+package com.persagy.dmp.version.entity;
 
-import com.persagy.dc.common.model.entity.AuditableEntity;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 
 /**

+ 1 - 1
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/ObjectInfoHistory.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.dictionary.entity;
+package com.persagy.dmp.version.entity;
 
 import lombok.Data;
 

+ 2 - 2
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/ObjectType.java

@@ -1,6 +1,6 @@
-package com.persagy.dc.dictionary.entity;
+package com.persagy.dmp.version.entity;
 
-import com.persagy.dc.common.model.entity.AuditableEntity;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 
 /**

+ 1 - 1
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/ObjectTypeHistory.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.dictionary.entity;
+package com.persagy.dmp.version.entity;
 
 import lombok.Data;
 

+ 3 - 3
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/entity/VersionDefine.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.dictionary.entity;
+package com.persagy.dmp.version.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.dc.common.lang.PsDateTime;
-import com.persagy.dc.common.model.entity.AuditableEntity;
+import com.persagy.dmp.common.lang.PsDateTime;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 
 /**

+ 2 - 2
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/IObjectInfoHistoryService.java

@@ -1,6 +1,6 @@
-package com.persagy.dc.dictionary.service;
+package com.persagy.dmp.version.service;
 
-import com.persagy.dc.dictionary.entity.ObjectInfoHistory;
+import com.persagy.dmp.version.entity.ObjectInfoHistory;
 
 /**
  * 对象信息点 服务

+ 2 - 2
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/IObjectTypeHistoryService.java

@@ -1,6 +1,6 @@
-package com.persagy.dc.dictionary.service;
+package com.persagy.dmp.version.service;
 
-import com.persagy.dc.dictionary.entity.ObjectTypeHistory;
+import com.persagy.dmp.version.entity.ObjectTypeHistory;
 
 /**
  * 对象类型 服务

+ 2 - 2
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/IVersionDefineService.java

@@ -1,6 +1,6 @@
-package com.persagy.dc.dictionary.service;
+package com.persagy.dmp.version.service;
 
-import com.persagy.dc.dictionary.entity.VersionDefine;
+import com.persagy.dmp.version.entity.VersionDefine;
 
 /**
  * 版本定义接口

+ 6 - 6
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/impl/ObjectInfoHistoryServiceImpl.java

@@ -1,11 +1,11 @@
-package com.persagy.dc.dictionary.service.impl;
+package com.persagy.dmp.version.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.dictionary.dao.ObjectInfoHistoryMapper;
-import com.persagy.dc.dictionary.entity.ObjectInfoHistory;
-import com.persagy.dc.dictionary.service.IObjectInfoHistoryService;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.version.dao.ObjectInfoHistoryMapper;
+import com.persagy.dmp.version.entity.ObjectInfoHistory;
+import com.persagy.dmp.version.service.IObjectInfoHistoryService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

+ 6 - 6
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/impl/ObjectTypeHistoryServiceImpl.java

@@ -1,11 +1,11 @@
-package com.persagy.dc.dictionary.service.impl;
+package com.persagy.dmp.version.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.dictionary.dao.ObjectTypeHistoryMapper;
-import com.persagy.dc.dictionary.entity.ObjectTypeHistory;
-import com.persagy.dc.dictionary.service.IObjectTypeHistoryService;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.version.dao.ObjectTypeHistoryMapper;
+import com.persagy.dmp.version.entity.ObjectTypeHistory;
+import com.persagy.dmp.version.service.IObjectTypeHistoryService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

+ 9 - 9
dc-business/dc-digital-version/src/main/java/com/persagy/dc/dictionary/service/impl/VersionDefineServiceImpl.java

@@ -1,15 +1,15 @@
-package com.persagy.dc.dictionary.service.impl;
+package com.persagy.dmp.version.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.dictionary.constant.VersionState;
-import com.persagy.dc.dictionary.dao.VersionDefineMapper;
-import com.persagy.dc.dictionary.entity.VersionDefine;
-import com.persagy.dc.dictionary.service.IObjectInfoHistoryService;
-import com.persagy.dc.dictionary.service.IObjectTypeHistoryService;
-import com.persagy.dc.dictionary.service.IVersionDefineService;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.version.constant.VersionState;
+import com.persagy.dmp.version.dao.VersionDefineMapper;
+import com.persagy.dmp.version.entity.VersionDefine;
+import com.persagy.dmp.version.service.IObjectInfoHistoryService;
+import com.persagy.dmp.version.service.IObjectTypeHistoryService;
+import com.persagy.dmp.version.service.IVersionDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
dc-business/dc-digital-version/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: dc-dic-manage
+    name: dmp-dic-manage
 
 config:
   file:

dc-business/dc-digital/src/main/resources/db.init/data.sql → dmp-business/dmp-rwd-version/src/main/resources/db.init/data.sql


dc-business/dc-knowledge/src/main/resources/db.init/schema.sql → dmp-business/dmp-rwd-version/src/main/resources/db.init/schema.sql


+ 1 - 1
dc-business/dc-digital-version/src/main/resources/mapper/ObjectInfoHistoryMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.persagy.dc.dictionary.dao.ObjectInfoHistoryMapper">
+<mapper namespace="com.persagy.dmp.version.dao.ObjectInfoHistoryMapper">
 
     <insert id="copyByVersion">
         insert into rwd_object_info_his(id,group_code,project_id,code,orig_code,name,alias_code,alias_name,

+ 1 - 2
dc-business/dc-digital-version/src/main/resources/mapper/ObjectTypeHistoryMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.persagy.dc.dictionary.dao.ObjectTypeHistoryMapper">
-
+<mapper namespace="com.persagy.dmp.version.dao.ObjectTypeHistoryMapper">
     <insert id="copyByVersion">
         insert into rwd_object_type_his(id,group_code,obj_type,name,alias_code,alias_name,
             type,project_id,major_code,system_code,equipment_code,parent_code,is_used,version,operator,operator_level)

dc-business/dc-digital/README.md → dmp-business/dmp-rwd/README.md


+ 6 - 6
dc-business/dc-digital/pom.xml

@@ -3,12 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>dc-business</artifactId>
+        <artifactId>dmp-business</artifactId>
         <groupId>com.persagy</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>dc-digital</artifactId>
+    <artifactId>dmp-rwd</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -20,19 +20,19 @@
         <!-- 项目启动 -->
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-server</artifactId>
+            <artifactId>dmp-server</artifactId>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-mybatis</artifactId>
+            <artifactId>dmp-mybatis</artifactId>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-amqp-starter</artifactId>
+            <artifactId>dmp-amqp-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
-            <artifactId>dc-digital-starter</artifactId>
+            <artifactId>dmp-digital-starter</artifactId>
         </dependency>
     </dependencies>
 </project>

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalDataCategory.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.basic.constant;
+package com.persagy.dmp.basic.constant;
 
 import lombok.Getter;
 

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalDataType.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.basic.constant;
+package com.persagy.dmp.basic.constant;
 
 import lombok.Getter;
 

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalMessageConstant.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.basic.constant;
+package com.persagy.dmp.basic.constant;
 
 /**
  * 消息相关常量

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalObjectType.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.basic.constant;
+package com.persagy.dmp.basic.constant;
 
 import lombok.Getter;
 

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/basic/constant/DigitalObjectTypeShort.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.basic.constant;
+package com.persagy.dmp.basic.constant;
 
 import lombok.Getter;
 

+ 6 - 6
dc-business/dc-digital/src/main/java/com/persagy/dc/basic/utils/DigitalCommonUtils.java

@@ -1,13 +1,13 @@
-package com.persagy.dc.basic.utils;
+package com.persagy.dmp.basic.utils;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.dc.basic.constant.DigitalObjectType;
-import com.persagy.dc.basic.constant.DigitalObjectTypeShort;
-import com.persagy.dc.common.constant.CommonConstant;
-import com.persagy.dc.common.context.AppContext;
-import com.persagy.dc.common.model.entity.BaseEntity;
+import com.persagy.dmp.basic.constant.DigitalObjectType;
+import com.persagy.dmp.basic.constant.DigitalObjectTypeShort;
+import com.persagy.dmp.common.constant.CommonConstant;
+import com.persagy.dmp.common.context.AppContext;
+import com.persagy.dmp.common.model.entity.BaseEntity;
 
 import java.util.ArrayList;
 import java.util.List;

+ 5 - 5
dc-business/dc-digital/src/main/java/com/persagy/dc/basic/utils/DigitalMessageHelper.java

@@ -1,10 +1,10 @@
-package com.persagy.dc.basic.utils;
+package com.persagy.dmp.basic.utils;
 
 import cn.hutool.json.JSONUtil;
-import com.persagy.dc.amqp.handler.RabbitMessageSender;
-import com.persagy.dc.basic.constant.DigitalMessageConstant;
-import com.persagy.dc.basic.model.DigitalManageMessage;
-import com.persagy.dc.common.model.entity.BaseEntity;
+import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.amqp.handler.RabbitMessageSender;
+import com.persagy.dmp.basic.constant.DigitalMessageConstant;
+import com.persagy.dmp.basic.model.DigitalManageMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

+ 3 - 3
dc-business/dc-digital/src/main/java/com/persagy/dc/basic/utils/QueryCriteriaHelper.java

@@ -1,11 +1,11 @@
-package com.persagy.dc.basic.utils;
+package com.persagy.dmp.basic.utils;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.persagy.dc.basic.model.QueryCriteria;
-import com.persagy.dc.common.model.entity.BaseEntity;
+import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.model.entity.BaseEntity;
 
 import java.util.Iterator;
 

+ 10 - 10
dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/GraphDefineController.java

@@ -1,16 +1,16 @@
-package com.persagy.dc.define.controller;
+package com.persagy.dmp.define.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.model.QueryCriteria;
-import com.persagy.dc.basic.utils.QueryCriteriaHelper;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.model.response.PageList;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.define.entity.GraphDefine;
-import com.persagy.dc.define.service.IGraphDefineService;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.model.response.PageList;
+import com.persagy.dmp.define.service.IGraphDefineService;
+import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.define.entity.GraphDefine;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 11 - 11
dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/ObjectInfoController.java

@@ -1,18 +1,18 @@
-package com.persagy.dc.define.controller;
+package com.persagy.dmp.define.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.model.QueryCriteria;
-import com.persagy.dc.basic.utils.DigitalCommonUtils;
-import com.persagy.dc.basic.utils.QueryCriteriaHelper;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.model.response.PageList;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
-import com.persagy.dc.define.service.IObjectInfoService;
+import com.persagy.dmp.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.model.response.PageList;
+import com.persagy.dmp.define.service.IObjectInfoService;
+import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 11 - 11
dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/ObjectTypeController.java

@@ -1,18 +1,18 @@
-package com.persagy.dc.define.controller;
+package com.persagy.dmp.define.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.model.QueryCriteria;
-import com.persagy.dc.basic.utils.DigitalCommonUtils;
-import com.persagy.dc.basic.utils.QueryCriteriaHelper;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.model.response.PageList;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.define.entity.ObjectTypeDefine;
-import com.persagy.dc.define.service.IObjectTypeService;
+import com.persagy.dmp.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.model.response.PageList;
+import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.define.entity.ObjectTypeDefine;
+import com.persagy.dmp.define.service.IObjectTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 12 - 12
dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/RelationDefineController.java

@@ -1,18 +1,18 @@
-package com.persagy.dc.define.controller;
+package com.persagy.dmp.define.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.model.QueryCriteria;
-import com.persagy.dc.basic.utils.DigitalCommonUtils;
-import com.persagy.dc.basic.utils.QueryCriteriaHelper;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.model.response.PageList;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.define.entity.ObjectTypeDefine;
-import com.persagy.dc.define.entity.RelationDefine;
-import com.persagy.dc.define.service.IRelationDefineService;
+import com.persagy.dmp.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.model.response.PageList;
+import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.define.entity.ObjectTypeDefine;
+import com.persagy.dmp.define.entity.RelationDefine;
+import com.persagy.dmp.define.service.IRelationDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/define/dao/GraphDefineMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.define.dao;
+package com.persagy.dmp.define.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.define.entity.GraphDefine;
+import com.persagy.dmp.define.entity.GraphDefine;
 
 /**
  * 图定义 DAO

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/define/dao/ObjectInfoMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.define.dao;
+package com.persagy.dmp.define.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
 
 /**
  * 信息点 DAO

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/define/dao/ObjectTypeMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.define.dao;
+package com.persagy.dmp.define.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.define.entity.ObjectTypeDefine;
+import com.persagy.dmp.define.entity.ObjectTypeDefine;
 
 /**
  * 对象类型 DAO

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/define/dao/RelationDefineMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.define.dao;
+package com.persagy.dmp.define.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.define.entity.RelationDefine;
+import com.persagy.dmp.define.entity.RelationDefine;
 
 /**
  * 关系定义 DAO

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/IGraphDefineService.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.define.service;
+package com.persagy.dmp.define.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.define.entity.GraphDefine;
+import com.persagy.dmp.define.entity.GraphDefine;
 
 import java.util.List;
 

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/IObjectInfoService.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.define.service;
+package com.persagy.dmp.define.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
 
 import java.util.List;
 import java.util.Map;

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/IObjectTypeService.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.define.service;
+package com.persagy.dmp.define.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.define.entity.ObjectTypeDefine;
+import com.persagy.dmp.define.entity.ObjectTypeDefine;
 
 import java.util.List;
 import java.util.Map;

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/IRelationDefineService.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.define.service;
+package com.persagy.dmp.define.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.define.entity.RelationDefine;
+import com.persagy.dmp.define.entity.RelationDefine;
 
 import java.util.List;
 

+ 5 - 5
dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/impl/GraphDefineServiceImpl.java

@@ -1,11 +1,11 @@
-package com.persagy.dc.define.service.impl;
+package com.persagy.dmp.define.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.define.dao.GraphDefineMapper;
-import com.persagy.dc.define.entity.GraphDefine;
-import com.persagy.dc.define.service.IGraphDefineService;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.define.dao.GraphDefineMapper;
+import com.persagy.dmp.define.service.IGraphDefineService;
+import com.persagy.dmp.define.entity.GraphDefine;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

+ 10 - 10
dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/impl/ObjectInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.define.service.impl;
+package com.persagy.dmp.define.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -7,15 +7,15 @@ import cn.hutool.core.text.StrFormatter;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.constant.DigitalMessageConstant;
-import com.persagy.dc.basic.utils.DigitalMessageHelper;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.entity.BaseEntity;
-import com.persagy.dc.define.dao.ObjectInfoMapper;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
-import com.persagy.dc.define.service.IObjectInfoService;
-import com.persagy.dc.parser.service.InfoDataFactory;
+import com.persagy.dmp.basic.constant.DigitalMessageConstant;
+import com.persagy.dmp.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.define.dao.ObjectInfoMapper;
+import com.persagy.dmp.define.service.IObjectInfoService;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.parser.service.InfoDataFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 10 - 10
dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/impl/ObjectTypeServiceImpl.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.define.service.impl;
+package com.persagy.dmp.define.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -9,15 +9,15 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.constant.DigitalMessageConstant;
-import com.persagy.dc.basic.utils.DigitalCommonUtils;
-import com.persagy.dc.basic.utils.DigitalMessageHelper;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.entity.BaseEntity;
-import com.persagy.dc.define.dao.ObjectTypeMapper;
-import com.persagy.dc.define.entity.ObjectTypeDefine;
-import com.persagy.dc.define.service.IObjectTypeService;
+import com.persagy.dmp.basic.constant.DigitalMessageConstant;
+import com.persagy.dmp.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.define.dao.ObjectTypeMapper;
+import com.persagy.dmp.define.service.IObjectTypeService;
+import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;

+ 5 - 5
dc-business/dc-digital/src/main/java/com/persagy/dc/define/service/impl/RelationDefineServiceImpl.java

@@ -1,11 +1,11 @@
-package com.persagy.dc.define.service.impl;
+package com.persagy.dmp.define.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.define.dao.RelationDefineMapper;
-import com.persagy.dc.define.entity.RelationDefine;
-import com.persagy.dc.define.service.IRelationDefineService;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.define.dao.RelationDefineMapper;
+import com.persagy.dmp.define.service.IRelationDefineService;
+import com.persagy.dmp.define.entity.RelationDefine;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/config/DigitalRabbitConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.digital.config;
+package com.persagy.dmp.digital.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Binding;

+ 11 - 11
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/controller/ObjectDigitalController.java

@@ -1,18 +1,18 @@
-package com.persagy.dc.digital.controller;
+package com.persagy.dmp.digital.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.model.QueryCriteria;
-import com.persagy.dc.basic.utils.DigitalCommonUtils;
-import com.persagy.dc.basic.utils.QueryCriteriaHelper;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.model.response.PageList;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.digital.entity.ObjectDigital;
-import com.persagy.dc.digital.service.IObjectDigitalService;
+import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.service.IObjectDigitalService;
+import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.model.response.PageList;
+import com.persagy.dmp.common.utils.ResultHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 11 - 11
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/controller/ObjectRelationController.java

@@ -1,18 +1,18 @@
-package com.persagy.dc.digital.controller;
+package com.persagy.dmp.digital.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.model.QueryCriteria;
-import com.persagy.dc.basic.utils.DigitalCommonUtils;
-import com.persagy.dc.basic.utils.QueryCriteriaHelper;
-import com.persagy.dc.common.constant.ResponseCode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.response.CommonResult;
-import com.persagy.dc.common.model.response.PageList;
-import com.persagy.dc.common.utils.ResultHelper;
-import com.persagy.dc.digital.entity.ObjectRelation;
-import com.persagy.dc.digital.service.IObjectRelationService;
+import com.persagy.dmp.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.model.response.PageList;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.service.IObjectRelationService;
+import com.persagy.dmp.basic.model.QueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/dao/ObjectDigitalMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.digital.dao;
+package com.persagy.dmp.digital.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 
 /**
  * 对象数据 DAO

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/dao/ObjectRelationMapper.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.digital.dao;
+package com.persagy.dmp.digital.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dc.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 
 /**
  * 关系数据 DAO

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/entity/ObjectDigital.java

@@ -1,10 +1,10 @@
-package com.persagy.dc.digital.entity;
+package com.persagy.dmp.digital.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.dc.common.model.entity.AuditableEntity;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/entity/ObjectRelation.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.digital.entity;
+package com.persagy.dmp.digital.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.dc.common.model.entity.AuditableEntity;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 9 - 9
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/handler/ProjectMessageHandler.java

@@ -1,16 +1,16 @@
-package com.persagy.dc.digital.handler;
+package com.persagy.dmp.digital.handler;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.persagy.dc.amqp.handler.AbstractRabbitHandlerTemplate;
-import com.persagy.dc.common.constant.CommonConstant;
-import com.persagy.dc.common.context.AppContext;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.digital.config.DigitalRabbitConfig;
-import com.persagy.dc.digital.entity.ObjectDigital;
-import com.persagy.dc.digital.service.IObjectDigitalService;
-import com.persagy.dc.mybatis.helper.DynamicDataSourceHelper;
+import com.persagy.dmp.digital.config.DigitalRabbitConfig;
+import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.amqp.handler.AbstractRabbitHandlerTemplate;
+import com.persagy.dmp.common.constant.CommonConstant;
+import com.persagy.dmp.common.context.AppContext;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.digital.service.IObjectDigitalService;
+import com.persagy.dmp.mybatis.helper.DynamicDataSourceHelper;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;

+ 4 - 4
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/handler/ProjectMessageVO.java

@@ -1,12 +1,12 @@
-package com.persagy.dc.digital.handler;
+package com.persagy.dmp.digital.handler;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.dc.common.context.AppContext;
-import com.persagy.dc.common.lang.PsDateTime;
-import com.persagy.dc.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.common.context.AppContext;
+import com.persagy.dmp.common.lang.PsDateTime;
 import lombok.Data;
 
 import java.math.BigDecimal;

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/service/IObjectDigitalService.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.digital.service;
+package com.persagy.dmp.digital.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 
 import java.util.List;
 

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/service/IObjectRelationService.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.digital.service;
+package com.persagy.dmp.digital.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 
 import java.util.List;
 

+ 12 - 12
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.digital.service.impl;
+package com.persagy.dmp.digital.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -6,17 +6,17 @@ import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.dc.basic.constant.DigitalMessageConstant;
-import com.persagy.dc.basic.utils.DigitalCommonUtils;
-import com.persagy.dc.basic.utils.DigitalMessageHelper;
-import com.persagy.dc.common.constant.ValidEnum;
-import com.persagy.dc.common.model.entity.BaseEntity;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
-import com.persagy.dc.define.service.IObjectInfoService;
-import com.persagy.dc.digital.dao.ObjectDigitalMapper;
-import com.persagy.dc.digital.entity.ObjectDigital;
-import com.persagy.dc.digital.service.IObjectDigitalService;
-import com.persagy.dc.parser.service.InfoDataFactory;
+import com.persagy.dmp.basic.constant.DigitalMessageConstant;
+import com.persagy.dmp.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.define.service.IObjectInfoService;
+import com.persagy.dmp.digital.dao.ObjectDigitalMapper;
+import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.service.IObjectDigitalService;
+import com.persagy.dmp.parser.service.InfoDataFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 5 - 5
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/service/impl/ObjectRelationServiceImpl.java

@@ -1,11 +1,11 @@
-package com.persagy.dc.digital.service.impl;
+package com.persagy.dmp.digital.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dc.basic.utils.DigitalMessageHelper;
-import com.persagy.dc.digital.dao.ObjectRelationMapper;
-import com.persagy.dc.digital.entity.ObjectRelation;
-import com.persagy.dc.digital.service.IObjectRelationService;
+import com.persagy.dmp.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.digital.dao.ObjectRelationMapper;
+import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.service.IObjectRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/entity/EnumVO.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.parser.entity;
+package com.persagy.dmp.parser.entity;
 
 import lombok.Data;
 

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/entity/ParserResult.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.parser.entity;
+package com.persagy.dmp.parser.entity;
 
 import cn.hutool.core.util.BooleanUtil;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import lombok.Data;
 
 /**

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/entity/RegionVO.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.parser.entity;
+package com.persagy.dmp.parser.entity;
 
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.annotation.JsonAlias;
-import com.persagy.dc.common.model.data.RegionValue;
+import com.persagy.dmp.common.model.data.RegionValue;
 import lombok.Data;
 
 import java.util.ArrayList;

+ 3 - 3
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/IInfoDataParser.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.parser.service;
+package com.persagy.dmp.parser.service;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
-import com.persagy.dc.parser.entity.ParserResult;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.parser.entity.ParserResult;
 
 /**
  * 信息点 处理器

+ 6 - 6
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/InfoDataFactory.java

@@ -1,12 +1,12 @@
-package com.persagy.dc.parser.service;
+package com.persagy.dmp.parser.service;
 
 import cn.hutool.core.map.MapUtil;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.persagy.dc.basic.constant.DigitalDataType;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
-import com.persagy.dc.parser.entity.ParserResult;
-import com.persagy.dc.parser.service.impl.*;
+import com.persagy.dmp.basic.constant.DigitalDataType;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.parser.entity.ParserResult;
+import com.persagy.dmp.parser.service.impl.*;
 
 import java.util.HashMap;
 import java.util.Map;

+ 9 - 9
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/AbstractInfoDataParser.java

@@ -1,18 +1,18 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
-import com.persagy.dc.basic.constant.DigitalDataCategory;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.helper.SpringHelper;
-import com.persagy.dc.common.model.data.RegionValue;
-import com.persagy.dc.define.entity.ObjectInfoDefine;
-import com.persagy.dc.parser.entity.ParserResult;
-import com.persagy.dc.parser.entity.RegionVO;
-import com.persagy.dc.parser.service.IInfoDataParser;
+import com.persagy.dmp.basic.constant.DigitalDataCategory;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.helper.SpringHelper;
+import com.persagy.dmp.common.model.data.RegionValue;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.parser.entity.ParserResult;
+import com.persagy.dmp.parser.entity.RegionVO;
+import com.persagy.dmp.parser.service.IInfoDataParser;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;

+ 3 - 3
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/AttachmentInfoParser.java

@@ -1,9 +1,9 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.parser.entity.ParserResult;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.parser.entity.ParserResult;
 
 import java.io.IOException;
 import java.util.List;

+ 3 - 3
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/BooleanInfoParser.java

@@ -1,8 +1,8 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.parser.entity.ParserResult;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.parser.entity.ParserResult;
 
 import java.io.IOException;
 

+ 5 - 5
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/DateInfoParser.java

@@ -1,11 +1,11 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.data.RegionValue;
-import com.persagy.dc.common.utils.RegionUtil;
-import com.persagy.dc.parser.entity.ParserResult;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.data.RegionValue;
+import com.persagy.dmp.common.utils.RegionUtil;
+import com.persagy.dmp.parser.entity.ParserResult;
 
 import java.io.IOException;
 import java.util.List;

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/DoubleInfoParser.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 /**
  * 数值信息点 处理器

+ 4 - 4
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/EnumInfoParser.java

@@ -1,10 +1,10 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.parser.entity.EnumVO;
-import com.persagy.dc.parser.entity.ParserResult;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.parser.entity.EnumVO;
+import com.persagy.dmp.parser.entity.ParserResult;
 
 import java.io.IOException;
 import java.util.HashSet;

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/IntegerInfoParser.java

@@ -1,4 +1,4 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 /**
  * 整数信息点 处理器

+ 5 - 5
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/NumberInfoParser.java

@@ -1,10 +1,10 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.data.RegionValue;
-import com.persagy.dc.common.utils.RegionUtil;
-import com.persagy.dc.parser.entity.ParserResult;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.data.RegionValue;
+import com.persagy.dmp.common.utils.RegionUtil;
+import com.persagy.dmp.parser.entity.ParserResult;
 
 import java.io.IOException;
 import java.util.List;

+ 5 - 5
dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/StringInfoParser.java

@@ -1,10 +1,10 @@
-package com.persagy.dc.parser.service.impl;
+package com.persagy.dmp.parser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dc.common.exception.BusinessException;
-import com.persagy.dc.common.model.data.RegionValue;
-import com.persagy.dc.common.utils.RegionUtil;
-import com.persagy.dc.parser.entity.ParserResult;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.data.RegionValue;
+import com.persagy.dmp.common.utils.RegionUtil;
+import com.persagy.dmp.parser.entity.ParserResult;
 
 import java.io.IOException;
 import java.util.List;

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/subscribe/entity/SubscribeObjectInfo.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.subscribe.entity;
+package com.persagy.dmp.subscribe.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.dc.common.model.entity.AuditableEntity;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 2 - 2
dc-business/dc-digital/src/main/java/com/persagy/dc/subscribe/entity/SubscribeObjectType.java

@@ -1,7 +1,7 @@
-package com.persagy.dc.subscribe.entity;
+package com.persagy.dmp.subscribe.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.dc.common.model.entity.AuditableEntity;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 0 - 0
dc-business/dc-digital/src/main/java/com/persagy/dc/subscribe/entity/SubscribeProject.java


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