linhuili před 3 roky
rodič
revize
c512ae2864
79 změnil soubory, kde provedl 197 přidání a 192 odebrání
  1. 1 1
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataController.java
  2. 1 1
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictTypeController.java
  3. 1 1
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/constant/VersionOperator.java
  4. 1 1
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/constant/VersionOperatorLevel.java
  5. 1 1
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/constant/VersionState.java
  6. 3 3
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/controller/VersionDefineController.java
  7. 2 2
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/dao/ObjectInfoHistoryMapper.java
  8. 2 2
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/dao/ObjectTypeHistoryMapper.java
  9. 2 2
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/dao/VersionDefineMapper.java
  10. 1 1
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/ObjectInfo.java
  11. 1 1
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/ObjectInfoHistory.java
  12. 1 1
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/ObjectType.java
  13. 1 1
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/ObjectTypeHistory.java
  14. 1 1
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/VersionDefine.java
  15. 2 2
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/IObjectInfoHistoryService.java
  16. 2 2
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/IObjectTypeHistoryService.java
  17. 2 2
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/IVersionDefineService.java
  18. 4 4
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/impl/ObjectInfoHistoryServiceImpl.java
  19. 4 4
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/impl/ObjectTypeHistoryServiceImpl.java
  20. 7 7
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/impl/VersionDefineServiceImpl.java
  21. 1 1
      dmp-business/dmp-rwd-version/src/main/resources/bootstrap.yml
  22. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalDataCategory.java
  23. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalDataType.java
  24. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalMessageConstant.java
  25. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalObjectType.java
  26. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalObjectTypeShort.java
  27. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/utils/DigitalCommonUtils.java
  28. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/utils/DigitalMessageHelper.java
  29. 2 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/utils/QueryCriteriaHelper.java
  30. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/controller/GraphDefineController.java
  31. 4 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/controller/ObjectInfoController.java
  32. 4 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/controller/ObjectTypeController.java
  33. 4 5
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/controller/RelationDefineController.java
  34. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/dao/GraphDefineMapper.java
  35. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/dao/ObjectInfoMapper.java
  36. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/dao/ObjectTypeMapper.java
  37. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/dao/RelationDefineMapper.java
  38. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/IGraphDefineService.java
  39. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/IObjectInfoService.java
  40. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/IObjectTypeService.java
  41. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/IRelationDefineService.java
  42. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/impl/GraphDefineServiceImpl.java
  43. 6 6
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/impl/ObjectInfoServiceImpl.java
  44. 6 6
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/impl/ObjectTypeServiceImpl.java
  45. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/impl/RelationDefineServiceImpl.java
  46. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/config/DigitalRabbitConfig.java
  47. 11 11
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/controller/ObjectDigitalController.java
  48. 11 11
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/controller/ObjectRelationController.java
  49. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/dao/ObjectDigitalMapper.java
  50. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/dao/ObjectRelationMapper.java
  51. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/entity/ObjectDigital.java
  52. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/entity/ObjectRelation.java
  53. 4 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/handler/ProjectMessageHandler.java
  54. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/handler/ProjectMessageVO.java
  55. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/service/IObjectDigitalService.java
  56. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/service/IObjectRelationService.java
  57. 10 9
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/service/impl/ObjectDigitalServiceImpl.java
  58. 5 5
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/service/impl/ObjectRelationServiceImpl.java
  59. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/entity/EnumVO.java
  60. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/entity/ParserResult.java
  61. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/entity/RegionVO.java
  62. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/IInfoDataParser.java
  63. 4 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/InfoDataFactory.java
  64. 5 5
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/AbstractInfoDataParser.java
  65. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/AttachmentInfoParser.java
  66. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/BooleanInfoParser.java
  67. 6 6
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/DateInfoParser.java
  68. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/DoubleInfoParser.java
  69. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/EnumInfoParser.java
  70. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/IntegerInfoParser.java
  71. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/NumberInfoParser.java
  72. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/StringInfoParser.java
  73. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/subscribe/entity/SubscribeObjectInfo.java
  74. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/subscribe/entity/SubscribeObjectType.java
  75. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/subscribe/entity/SubscribeProject.java
  76. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/subscribe/entity/SubscribeSchema.java
  77. 1 1
      dmp-business/dmp-rwd/src/main/resources/bootstrap.yml
  78. 6 4
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoDefine.java
  79. 3 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectTypeDefine.java

+ 1 - 1
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataController.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @date:2021/6/10
  */
 @RestController
-@RequestMapping(value = "/dic/data/")
+@RequestMapping(value = "/dic/dit/data")
 public class DictDataController {
 
     @Autowired

+ 1 - 1
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictTypeController.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @date:2021/6/10
  */
 @RestController
-@RequestMapping(value = "/dic/type/")
+@RequestMapping(value = "/dic/dt/type")
 public class DictTypeController {
 
     @Autowired

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/constant/VersionOperator.java

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

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/constant/VersionOperatorLevel.java

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

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/constant/VersionState.java

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

+ 3 - 3
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/controller/VersionDefineController.java

@@ -1,12 +1,12 @@
-package com.persagy.dmp.version.controller;
+package com.persagy.dmp.rwd.version.controller;
 
 import cn.hutool.core.util.StrUtil;
 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 com.persagy.dmp.rwd.version.entity.VersionDefine;
+import com.persagy.dmp.rwd.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
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/dao/ObjectInfoHistoryMapper.java

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

+ 2 - 2
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/dao/ObjectTypeHistoryMapper.java

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

+ 2 - 2
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/dao/VersionDefineMapper.java

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

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/ObjectInfo.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.version.entity;
+package com.persagy.dmp.rwd.version.entity;
 
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/ObjectInfoHistory.java

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

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/ObjectType.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.version.entity;
+package com.persagy.dmp.rwd.version.entity;
 
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/ObjectTypeHistory.java

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

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/entity/VersionDefine.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.version.entity;
+package com.persagy.dmp.rwd.version.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.lang.PsDateTime;

+ 2 - 2
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/IObjectInfoHistoryService.java

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

+ 2 - 2
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/IObjectTypeHistoryService.java

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

+ 2 - 2
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/IVersionDefineService.java

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

+ 4 - 4
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/impl/ObjectInfoHistoryServiceImpl.java

@@ -1,11 +1,11 @@
-package com.persagy.dmp.version.service.impl;
+package com.persagy.dmp.rwd.version.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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 com.persagy.dmp.rwd.version.dao.ObjectInfoHistoryMapper;
+import com.persagy.dmp.rwd.version.entity.ObjectInfoHistory;
+import com.persagy.dmp.rwd.version.service.IObjectInfoHistoryService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

+ 4 - 4
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/impl/ObjectTypeHistoryServiceImpl.java

@@ -1,11 +1,11 @@
-package com.persagy.dmp.version.service.impl;
+package com.persagy.dmp.rwd.version.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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 com.persagy.dmp.rwd.version.dao.ObjectTypeHistoryMapper;
+import com.persagy.dmp.rwd.version.entity.ObjectTypeHistory;
+import com.persagy.dmp.rwd.version.service.IObjectTypeHistoryService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

+ 7 - 7
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/version/service/impl/VersionDefineServiceImpl.java

@@ -1,15 +1,15 @@
-package com.persagy.dmp.version.service.impl;
+package com.persagy.dmp.rwd.version.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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 com.persagy.dmp.rwd.version.dao.VersionDefineMapper;
+import com.persagy.dmp.rwd.version.entity.VersionDefine;
+import com.persagy.dmp.rwd.version.service.IObjectInfoHistoryService;
+import com.persagy.dmp.rwd.version.service.IObjectTypeHistoryService;
+import com.persagy.dmp.rwd.version.constant.VersionState;
+import com.persagy.dmp.rwd.version.service.IVersionDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/resources/bootstrap.yml

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

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalDataCategory.java

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

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalDataType.java

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

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalMessageConstant.java

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

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalObjectType.java

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

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/constant/DigitalObjectTypeShort.java

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

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/utils/DigitalCommonUtils.java

@@ -1,10 +1,10 @@
-package com.persagy.dmp.basic.utils;
+package com.persagy.dmp.rwd.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.dmp.basic.constant.DigitalObjectType;
-import com.persagy.dmp.basic.constant.DigitalObjectTypeShort;
+import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
+import com.persagy.dmp.rwd.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;

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/utils/DigitalMessageHelper.java

@@ -1,9 +1,9 @@
-package com.persagy.dmp.basic.utils;
+package com.persagy.dmp.rwd.basic.utils;
 
 import cn.hutool.json.JSONUtil;
 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.rwd.basic.constant.DigitalMessageConstant;
 import com.persagy.dmp.basic.model.DigitalManageMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

+ 2 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/basic/utils/QueryCriteriaHelper.java

@@ -1,10 +1,11 @@
-package com.persagy.dmp.basic.utils;
+package com.persagy.dmp.rwd.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.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 
 import java.util.Iterator;

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/controller/GraphDefineController.java

@@ -1,13 +1,13 @@
-package com.persagy.dmp.define.controller;
+package com.persagy.dmp.rwd.define.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.rwd.define.service.IGraphDefineService;
+import com.persagy.dmp.rwd.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;

+ 4 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/controller/ObjectInfoController.java

@@ -1,15 +1,15 @@
-package com.persagy.dmp.define.controller;
+package com.persagy.dmp.rwd.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.dmp.basic.utils.DigitalCommonUtils;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.rwd.define.service.IObjectInfoService;
+import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.rwd.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;

+ 4 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/controller/ObjectTypeController.java

@@ -1,10 +1,10 @@
-package com.persagy.dmp.define.controller;
+package com.persagy.dmp.rwd.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.dmp.basic.utils.DigitalCommonUtils;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.rwd.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;
@@ -12,7 +12,7 @@ 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 com.persagy.dmp.rwd.define.service.IObjectTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 4 - 5
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/controller/RelationDefineController.java

@@ -1,18 +1,17 @@
-package com.persagy.dmp.define.controller;
+package com.persagy.dmp.rwd.define.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dmp.basic.utils.DigitalCommonUtils;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.rwd.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 com.persagy.dmp.rwd.define.service.IRelationDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/dao/GraphDefineMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.dao;
+package com.persagy.dmp.rwd.define.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.dmp.define.entity.GraphDefine;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/dao/ObjectInfoMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.dao;
+package com.persagy.dmp.rwd.define.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/dao/ObjectTypeMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.dao;
+package com.persagy.dmp.rwd.define.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/dao/RelationDefineMapper.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.dao;
+package com.persagy.dmp.rwd.define.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.dmp.define.entity.RelationDefine;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/IGraphDefineService.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.service;
+package com.persagy.dmp.rwd.define.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/IObjectInfoService.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.service;
+package com.persagy.dmp.rwd.define.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/IObjectTypeService.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.service;
+package com.persagy.dmp.rwd.define.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/IRelationDefineService.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.service;
+package com.persagy.dmp.rwd.define.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/impl/GraphDefineServiceImpl.java

@@ -1,10 +1,10 @@
-package com.persagy.dmp.define.service.impl;
+package com.persagy.dmp.rwd.define.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.rwd.define.dao.GraphDefineMapper;
+import com.persagy.dmp.rwd.define.service.IGraphDefineService;
 import com.persagy.dmp.define.entity.GraphDefine;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 6 - 6
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/impl/ObjectInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.service.impl;
+package com.persagy.dmp.rwd.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.dmp.basic.constant.DigitalMessageConstant;
-import com.persagy.dmp.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
+import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.rwd.define.dao.ObjectInfoMapper;
+import com.persagy.dmp.rwd.define.service.IObjectInfoService;
 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 com.persagy.dmp.rwd.parser.service.InfoDataFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 6 - 6
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/impl/ObjectTypeServiceImpl.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.service.impl;
+package com.persagy.dmp.rwd.define.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -9,14 +9,14 @@ 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.dmp.basic.constant.DigitalMessageConstant;
-import com.persagy.dmp.basic.utils.DigitalCommonUtils;
-import com.persagy.dmp.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
+import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.rwd.define.dao.ObjectTypeMapper;
+import com.persagy.dmp.rwd.define.service.IObjectTypeService;
 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;

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/define/service/impl/RelationDefineServiceImpl.java

@@ -1,10 +1,10 @@
-package com.persagy.dmp.define.service.impl;
+package com.persagy.dmp.rwd.define.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.rwd.define.dao.RelationDefineMapper;
+import com.persagy.dmp.rwd.define.service.IRelationDefineService;
 import com.persagy.dmp.define.entity.RelationDefine;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

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

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

@@ -1,13 +1,13 @@
-package com.persagy.dmp.digital.controller;
+package com.persagy.dmp.rwd.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.dmp.digital.entity.ObjectDigital;
-import com.persagy.dmp.digital.service.IObjectDigitalService;
+import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
+import com.persagy.dmp.rwd.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;
@@ -48,39 +48,39 @@ public class ObjectDigitalController {
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
-    @PostMapping("/create")
+    @PostMapping("/createOne")
     public CommonResult<ObjectDigital> create(@Valid @RequestBody ObjectDigital vo){
         List<ObjectDigital> voList = CollUtil.newArrayList(vo);
         service.insert(voList);
         return ResultHelper.single(vo);
     }
 
-    @PostMapping("/createBatch")
+    @PostMapping("/create")
     public CommonResult<PageList<ObjectDigital>> createBatch(@Valid @RequestBody List<ObjectDigital> voList){
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
     }
 
-    @PostMapping("/update")
+    @PostMapping("/updateOne")
     public CommonResult<ObjectDigital> update(@Valid @RequestBody ObjectDigital vo){
         List<ObjectDigital> voList = CollUtil.newArrayList(vo);
         service.update(voList);
         return ResultHelper.single(vo);
     }
 
-    @PostMapping("/updateBatch")
+    @PostMapping("/update")
     public CommonResult<PageList<ObjectDigital>> updateBatch(@Valid @RequestBody List<ObjectDigital> voList){
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }
 
-    @PostMapping("/delete")
+    @PostMapping("/deleteOne")
     public CommonResult delete(@RequestBody String id){
         service.delete(CollUtil.newArrayList(id));
         return ResultHelper.success();
     }
 
-    @PostMapping("/deleteBatch")
+    @PostMapping("/delete")
     public CommonResult deleteBatch(@RequestBody List<String> id){
         service.delete(id);
         return ResultHelper.success();

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

@@ -1,17 +1,17 @@
-package com.persagy.dmp.digital.controller;
+package com.persagy.dmp.rwd.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.dmp.basic.utils.DigitalCommonUtils;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.rwd.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.rwd.digital.entity.ObjectRelation;
+import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,39 +48,39 @@ public class ObjectRelationController {
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
-    @PostMapping("/create")
+    @PostMapping("/createOne")
     public CommonResult<ObjectRelation> create(@Valid @RequestBody ObjectRelation vo){
         List<ObjectRelation> voList = CollUtil.newArrayList(vo);
         service.insert(voList);
         return ResultHelper.single(vo);
     }
 
-    @PostMapping("/createBatch")
+    @PostMapping("/create")
     public CommonResult<PageList<ObjectRelation>> createBatch(@Valid @RequestBody List<ObjectRelation> voList){
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
     }
 
-    @PostMapping("/update")
+    @PostMapping("/updateOne")
     public CommonResult<ObjectRelation> update(@Valid @RequestBody ObjectRelation vo){
         List<ObjectRelation> voList = CollUtil.newArrayList(vo);
         service.update(voList);
         return ResultHelper.single(vo);
     }
 
-    @PostMapping("/updateBatch")
+    @PostMapping("/update")
     public CommonResult<PageList<ObjectRelation>> updateBatch(@Valid @RequestBody List<ObjectRelation> voList){
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }
 
-    @PostMapping("/delete")
+    @PostMapping("/deleteOne")
     public CommonResult delete(@RequestBody String id){
         service.delete(CollUtil.newArrayList(id));
         return ResultHelper.success();
     }
 
-    @PostMapping("/deleteBatch")
+    @PostMapping("/delete")
     public CommonResult deleteBatch(@RequestBody List<String> id){
         service.delete(id);
         return ResultHelper.success();

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

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

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

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

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/entity/ObjectDigital.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.digital.entity;
+package com.persagy.dmp.rwd.digital.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/entity/ObjectRelation.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.digital.entity;
+package com.persagy.dmp.rwd.digital.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;

+ 4 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/handler/ProjectMessageHandler.java

@@ -1,15 +1,15 @@
-package com.persagy.dmp.digital.handler;
+package com.persagy.dmp.rwd.digital.handler;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.persagy.dmp.digital.config.DigitalRabbitConfig;
-import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.rwd.digital.config.DigitalRabbitConfig;
+import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
+import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 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;

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/handler/ProjectMessageVO.java

@@ -1,10 +1,10 @@
-package com.persagy.dmp.digital.handler;
+package com.persagy.dmp.rwd.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.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.lang.PsDateTime;
 import lombok.Data;

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

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

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

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

+ 10 - 9
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.digital.service.impl;
+package com.persagy.dmp.rwd.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.dmp.basic.constant.DigitalMessageConstant;
-import com.persagy.dmp.basic.utils.DigitalCommonUtils;
-import com.persagy.dmp.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
+import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
+import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
+import com.persagy.dmp.rwd.define.service.IObjectInfoService;
 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 com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
+import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
+import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
+import com.persagy.dmp.rwd.parser.service.InfoDataFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -73,6 +73,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
         return voList;
     }
 
+
     @Override
     public List<ObjectDigital> update(List<ObjectDigital> voList) {
         if(CollUtil.isEmpty(voList)) {

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

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

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/entity/EnumVO.java

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

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/entity/ParserResult.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.parser.entity;
+package com.persagy.dmp.rwd.parser.entity;
 
 import cn.hutool.core.util.BooleanUtil;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -28,7 +28,7 @@ public class ParserResult {
      * @return
      */
     public boolean isMulti() {
-        return BooleanUtil.isTrue(infoDefine.getMultipleFlag());
+        return BooleanUtil.isTrue(infoDefine.getIsMultiple());
     }
 
     /**
@@ -36,6 +36,6 @@ public class ParserResult {
      * @return
      */
     public boolean isRegion() {
-        return BooleanUtil.isTrue(infoDefine.getRegionFlag());
+        return BooleanUtil.isTrue(infoDefine.getIsRegion());
     }
 }

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/entity/RegionVO.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.parser.entity;
+package com.persagy.dmp.rwd.parser.entity;
 
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.annotation.JsonAlias;

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/IInfoDataParser.java

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

+ 4 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/InfoDataFactory.java

@@ -1,12 +1,12 @@
-package com.persagy.dmp.parser.service;
+package com.persagy.dmp.rwd.parser.service;
 
 import cn.hutool.core.map.MapUtil;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.persagy.dmp.basic.constant.DigitalDataType;
+import com.persagy.dmp.rwd.basic.constant.DigitalDataType;
+import com.persagy.dmp.rwd.parser.entity.ParserResult;
+import com.persagy.dmp.rwd.parser.service.impl.*;
 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;

+ 5 - 5
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/AbstractInfoDataParser.java

@@ -1,18 +1,18 @@
-package com.persagy.dmp.parser.service.impl;
+package com.persagy.dmp.rwd.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.dmp.basic.constant.DigitalDataCategory;
+import com.persagy.dmp.rwd.basic.constant.DigitalDataCategory;
+import com.persagy.dmp.rwd.parser.entity.ParserResult;
 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 com.persagy.dmp.rwd.parser.entity.RegionVO;
+import com.persagy.dmp.rwd.parser.service.IInfoDataParser;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/AttachmentInfoParser.java

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

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/BooleanInfoParser.java

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

+ 6 - 6
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/DateInfoParser.java

@@ -1,11 +1,11 @@
-package com.persagy.dmp.parser.service.impl;
+package com.persagy.dmp.rwd.parser.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 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 com.persagy.dmp.rwd.parser.entity.ParserResult;
 
 import java.io.IOException;
 import java.util.List;
@@ -20,10 +20,10 @@ public class DateInfoParser extends AbstractInfoDataParser {
     @Override
     protected void validateDefine(ParserResult result) throws IOException {
         // 格式默认为yyyyMMddHHmmss
-        if(StrUtil.isBlank(result.getInfoDefine().getFormatter())) {
-            result.getInfoDefine().setFormatter("yyyyMMddHHmmss");
+        if(StrUtil.isBlank(result.getInfoDefine().getFormater())) {
+            result.getInfoDefine().setFormater("yyyyMMddHHmmss");
         }
-        String formatter = result.getInfoDefine().getFormatter();
+        String formatter = result.getInfoDefine().getFormater();
         // 数据源 - 应为区间列表格式
         List<RegionValue<String>> dataSource = formatRegionListValue(result.getInfoDefine().getDataSource(), String.class);
         // 区间格式校验
@@ -34,7 +34,7 @@ public class DateInfoParser extends AbstractInfoDataParser {
 
     @Override
     protected void validateValue(ParserResult result) throws IOException {
-        String formatter = result.getInfoDefine().getFormatter();
+        String formatter = result.getInfoDefine().getFormater();
         // 数据源定义信息
         List<RegionValue<String>> dataSource = formatRegionListValue(result.getInfoDefine().getDataSource(), String.class);
         // 复数

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/DoubleInfoParser.java

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

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/EnumInfoParser.java

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

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/IntegerInfoParser.java

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

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/NumberInfoParser.java

@@ -1,10 +1,10 @@
-package com.persagy.dmp.parser.service.impl;
+package com.persagy.dmp.rwd.parser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 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 com.persagy.dmp.rwd.parser.entity.ParserResult;
 
 import java.io.IOException;
 import java.util.List;

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/parser/service/impl/StringInfoParser.java

@@ -1,10 +1,10 @@
-package com.persagy.dmp.parser.service.impl;
+package com.persagy.dmp.rwd.parser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 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 com.persagy.dmp.rwd.parser.entity.ParserResult;
 
 import java.io.IOException;
 import java.util.List;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/subscribe/entity/SubscribeObjectInfo.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.subscribe.entity;
+package com.persagy.dmp.rwd.subscribe.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/subscribe/entity/SubscribeObjectType.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.subscribe.entity;
+package com.persagy.dmp.rwd.subscribe.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/subscribe/entity/SubscribeProject.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.subscribe.entity;
+package com.persagy.dmp.rwd.subscribe.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/subscribe/entity/SubscribeSchema.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.subscribe.entity;
+package com.persagy.dmp.rwd.subscribe.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;

+ 1 - 1
dmp-business/dmp-rwd/src/main/resources/bootstrap.yml

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

+ 6 - 4
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoDefine.java

@@ -29,10 +29,12 @@ public class ObjectInfoDefine extends AuditableEntity {
     private String aliasName;
     /** 类型编码 */
     private String classCode;
+    /** 集团编码 */
+    private String groupCode;
     /** 信息点分类:STATIC-静态,PULSE-脉冲,GRADATION-阶段,SEQUENTIAL-时序 */
     private String category;
     /** 管理层级:common-平台级,group-集团级,project-项目级 */
-///    private String type;
+    private String type;
     /** 一级标签 */
     private String firstTag;
     /** 二级标签 */
@@ -46,11 +48,11 @@ public class ObjectInfoDefine extends AuditableEntity {
     /** 数据类型 */
     private String dataType;
     /** 复数标识 */
-    private Boolean multipleFlag = false;
+    private Boolean isMultiple = false;
     /** 区间标识 */
-    private Boolean regionFlag = false;
+    private Boolean isRegion = false;
     /** 数据格式 */
-    private String formatter;
+    private String formater;
     /** 取值范围 */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private ArrayNode dataSource;

+ 3 - 1
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectTypeDefine.java

@@ -40,9 +40,11 @@ public class ObjectTypeDefine extends AuditableEntity {
     @NotNull
     private String objType;
     /** 管理层级:common-平台级,group-集团级,project-项目级 */
-///    private String type;
+    private String type;
     /** 项目ID */
     private String projectId;
+    /** 集团编码 */
+    private String groupCode;
     /** 专业编码:上级类型是系统/设备时该字段有值 */
     private String majorCode;
     /** 系统编码:上级类型是设备时该字段有值,值为系统类型的code */