代码位置调整

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

@@ -3,16 +3,15 @@ package com.persagy.dmp.dic.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.model.QueryCriteria;
+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.dic.entity.DictData;
-import com.persagy.dmp.dic.entity.DictData;
 import com.persagy.dmp.dic.entity.DictType;
 import com.persagy.dmp.dic.service.DictDataService;
-import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataMapController.java

@@ -3,6 +3,7 @@ package com.persagy.dmp.dic.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.model.QueryCriteria;
+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;
@@ -10,7 +11,6 @@ import com.persagy.dmp.common.model.response.PageList;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.dic.entity.DictDataMap;
 import com.persagy.dmp.dic.service.DictDataMapService;
-import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -3,6 +3,7 @@ package com.persagy.dmp.dic.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.model.QueryCriteria;
+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;
@@ -10,9 +11,11 @@ import com.persagy.dmp.common.model.response.PageList;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.dic.entity.DictType;
 import com.persagy.dmp.dic.service.DictTypeService;
-import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 字典类型

dmp-business/dmp-rwd-version/pom.xml

@@ -26,5 +26,9 @@
             <groupId>com.persagy</groupId>
             <artifactId>dmp-mybatis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.persagy</groupId>
+            <artifactId>dmp-digital-starter</artifactId>
+        </dependency>
     </dependencies>
 </project>

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

@@ -1,14 +0,0 @@
-package com.persagy.dmp.rwd.version.entity;
-
-import com.persagy.dmp.common.model.entity.AuditableEntity;
-import lombok.Data;
-
-/**
- * 对象信息点
- * 应该是在RWD的SDK中，但SDK现在没有，所以暂时先在此定义一个
- * @author Charlie Yu
- * @date 2021-06-23
- */
-@Data
-public class ObjectInfo extends AuditableEntity {
-}

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

@@ -1,6 +1,9 @@
 package com.persagy.dmp.rwd.version.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 信息点 历史记录
@@ -8,7 +11,9 @@ import lombok.Data;
  * @date 2021-06-23
  */
 @Data
-public class ObjectInfoHistory extends ObjectInfo{
+@EqualsAndHashCode(callSuper = true)
+@TableName("dt_define_info_his")
+public class ObjectInfoHistory extends ObjectInfoDefine {
 
     /** 版本号 */
     private String version;

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

@@ -1,14 +0,0 @@
-package com.persagy.dmp.rwd.version.entity;
-
-import com.persagy.dmp.common.model.entity.AuditableEntity;
-import lombok.Data;
-
-/**
- * 对象类型
- * 应该是在RWD的SDK中，但SDK现在没有，所以暂时先在此定义一个
- * @author Charlie Yu
- * @date 2021-06-23
- */
-@Data
-public class ObjectType extends AuditableEntity {
-}

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

@@ -1,6 +1,9 @@
 package com.persagy.dmp.rwd.version.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 对象类型 历史记录
@@ -8,7 +11,9 @@ import lombok.Data;
  * @date 2021-06-23
  */
 @Data
-public class ObjectTypeHistory extends ObjectType{
+@EqualsAndHashCode(callSuper = true)
+@TableName("dt_define_type_his")
+public class ObjectTypeHistory extends ObjectTypeDefine {
 
     /** 版本号 */
     private String version;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.lang.PsDateTime;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 版本定义
@@ -11,7 +12,8 @@ import lombok.Data;
  * @date 2021-06-23
  */
 @Data
-@TableName("rwdedit_version")
+@EqualsAndHashCode(callSuper = true)
+@TableName("dt_define_version")
 public class VersionDefine extends AuditableEntity {
 
     /** 版本号 */

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

@@ -2,15 +2,15 @@ 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.rwd.define.service.IGraphDefineService;
+import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
+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.GraphDefine;
+import com.persagy.dmp.rwd.define.service.IGraphDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -4,6 +4,7 @@ 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.model.QueryCriteria;
+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;
@@ -11,7 +12,6 @@ import com.persagy.dmp.common.model.response.PageList;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
-import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.define.service.IObjectInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -4,6 +4,7 @@ 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.model.QueryCriteria;
+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;
@@ -11,7 +12,6 @@ import com.persagy.dmp.common.model.response.PageList;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
-import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.define.service.IObjectTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -3,6 +3,7 @@ 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.model.QueryCriteria;
+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;
@@ -10,7 +11,6 @@ import com.persagy.dmp.common.model.response.PageList;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
-import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.define.service.IRelationDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.JsonNodeUtils;
+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.entity.BaseEntity;
@@ -16,7 +17,6 @@ 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.mybatis.utils.ConditionUtil;
-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 org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,13 +4,13 @@ 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.model.QueryCriteria;
+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.mybatis.utils.ConditionUtil;
-import com.persagy.dmp.rwd.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import org.springframework.beans.factory.annotation.Autowired;

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

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