Procházet zdrojové kódy

1. 调整CommonResult格式,使用dmp格式。
2. 修复build警告

yucheng před 3 roky
rodič
revize
af6161fb2f
31 změnil soubory, kde provedl 129 přidání a 84 odebrání
  1. 1 2
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/codetable/controller/CodeTableDataController.java
  2. 1 1
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/codetable/entity/CodeTableType.java
  3. 2 3
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataController.java
  4. 3 2
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataMapController.java
  5. 3 2
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictTypeController.java
  6. 4 5
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/entity/DictData.java
  7. 2 4
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/entity/DictDataMap.java
  8. 3 1
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/entity/DictType.java
  9. 3 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/GraphDefineController.java
  10. 3 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java
  11. 3 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectTypeController.java
  12. 3 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/RelationDefineController.java
  13. 3 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java
  14. 3 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java
  15. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/entity/ObjectRelation.java
  16. 4 5
      dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/controller/FileController.java
  17. 2 0
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/model/MessageType.java
  18. 2 0
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/model/MessageVO.java
  19. 2 0
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/model/SenderRegister.java
  20. 7 6
      dmp-common/src/main/java/com/persagy/dmp/common/model/response/CommonResult.java
  21. 36 13
      dmp-common/src/main/java/com/persagy/dmp/common/utils/ResultHelper.java
  22. 4 3
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalDefineClient.java
  23. 4 3
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalDefineFacade.java
  24. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/GraphDefine.java
  25. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoDefine.java
  26. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectTypeDefine.java
  27. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/RelationDefine.java
  28. 2 0
      dmp-comp/dmp-file-starter/src/main/java/com/persagy/dmp/file/model/FileInfo.java
  29. 22 7
      dmp-comp/dmp-mybatis/src/main/java/com/persagy/dmp/mybatis/typehandler/PsDateTimeTypeHandler.java
  30. 1 1
      dmp-comp/dmp-mybatis/src/main/java/com/persagy/dmp/mybatis/typehandler/PsDateTypeHandler.java
  31. 1 1
      dmp-comp/dmp-mybatis/src/main/java/com/persagy/dmp/mybatis/typehandler/PsTimeTypeHandler.java

+ 1 - 2
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/codetable/controller/CodeTableDataController.java

@@ -5,7 +5,6 @@ import com.persagy.dmp.codetable.entity.CodeTableData;
 import com.persagy.dmp.codetable.service.ICodeTableDataService;
 import com.persagy.dmp.common.context.AppContext;
 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.GetMapping;
@@ -33,7 +32,7 @@ public class CodeTableDataController {
      * @return List<CodeTableDetail>
      */
     @GetMapping("/queryAll/{typeCode}")
-    public CommonResult<PageList<CodeTableData>> queryCodeTableDetailListByCodeTableId(@PathVariable String typeCode) {
+    public CommonResult<List<CodeTableData>> queryCodeTableDetailListByCodeTableId(@PathVariable String typeCode) {
         if (StrUtil.isBlank(typeCode)) {
             return null;
         }

+ 1 - 1
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/codetable/entity/CodeTableType.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("dt_code_type")
+@TableName(value = "dt_code_type", autoResultMap = true)
 public class CodeTableType extends AuditableEntity {
 
     /** 集团编码 */

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

@@ -7,7 +7,6 @@ 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.DictType;
@@ -33,7 +32,7 @@ public class DictDataController {
     private DictDataService service;
 
     @PostMapping("/query")
-    public CommonResult<PageList<DictData>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<DictData>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
@@ -63,7 +62,7 @@ public class DictDataController {
     }
 
     @PostMapping("/result")
-    public CommonResult<PageList<DictData>> query(@RequestBody DictType dictType) {
+    public CommonResult<List<DictData>> query(@RequestBody DictType dictType) {
         if(dictType == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }

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

@@ -7,7 +7,6 @@ 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.DictDataMap;
 import com.persagy.dmp.dic.service.DictDataMapService;
@@ -17,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 字典数据映射
  * @author:linhuili
@@ -30,7 +31,7 @@ public class DictDataMapController {
     private DictDataMapService service;
 
     @PostMapping("/query")
-    public CommonResult<PageList<DictDataMap>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<DictDataMap>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }

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

@@ -7,7 +7,6 @@ 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.DictType;
 import com.persagy.dmp.dic.service.DictTypeService;
@@ -17,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 字典类型
  * @author:linhuili
@@ -30,7 +31,7 @@ public class DictTypeController {
     private DictTypeService service;
 
     @PostMapping("/query")
-    public CommonResult<PageList<DictType>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<DictType>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }

+ 4 - 5
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/entity/DictData.java

@@ -3,8 +3,8 @@ package com.persagy.dmp.dic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
-import lombok.*;
-import lombok.experimental.Accessors;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 字典数据
@@ -12,9 +12,8 @@ import lombok.experimental.Accessors;
  * @since 2021/06/10
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("dic_dt_data")
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "dic_dt_data", autoResultMap = true)
 public class DictData extends AuditableEntity {
 	/** 字典类型ID */
 	private String dictTypeId;

+ 2 - 4
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/entity/DictDataMap.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 /**
  * 字典数据
@@ -13,9 +12,8 @@ import lombok.experimental.Accessors;
  * @since 2021/06/10
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("dic_dt_data_map")
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "dic_dt_data_map", autoResultMap = true)
 public class DictDataMap extends AuditableEntity {
 	/** 字典数据ID */
 	private String dictDataId;

+ 3 - 1
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/entity/DictType.java

@@ -3,6 +3,7 @@ package com.persagy.dmp.dic.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 字典类型
@@ -10,7 +11,8 @@ import lombok.Data;
  * @since 2021/06/10
  */
 @Data
-@TableName("dic_dt_type")
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "dic_dt_type", autoResultMap = true)
 public class DictType extends AuditableEntity {
 
     private static final long serialVersionUID = 1L;

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

@@ -7,7 +7,6 @@ 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.define.entity.GraphDefine;
 import com.persagy.dmp.rwd.define.service.IGraphDefineService;
@@ -17,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 对象类型 Controller
  * @author Charlie Yu
@@ -30,7 +31,7 @@ public class GraphDefineController {
     private IGraphDefineService service;
 
     @PostMapping("/query")
-    public CommonResult<PageList<GraphDefine>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<GraphDefine>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }

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

@@ -8,7 +8,6 @@ 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.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
@@ -35,7 +34,7 @@ public class ObjectInfoController {
     private IObjectInfoService service;
 
     @PostMapping("")
-    public CommonResult<PageList<ObjectInfoDefine>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<ObjectInfoDefine>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
@@ -61,7 +60,7 @@ public class ObjectInfoController {
     }
 
     @PostMapping("/createBatch")
-    public CommonResult<PageList<ObjectInfoDefine>> createBatch(@Valid @RequestBody List<ObjectInfoDefine> voList){
+    public CommonResult<List<ObjectInfoDefine>> createBatch(@Valid @RequestBody List<ObjectInfoDefine> voList){
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
     }
@@ -74,7 +73,7 @@ public class ObjectInfoController {
     }
 
     @PostMapping("/updateBatch")
-    public CommonResult<PageList<ObjectInfoDefine>> updateBatch(@Valid @RequestBody List<ObjectInfoDefine> voList){
+    public CommonResult<List<ObjectInfoDefine>> updateBatch(@Valid @RequestBody List<ObjectInfoDefine> voList){
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }

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

@@ -8,7 +8,6 @@ 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.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
@@ -35,7 +34,7 @@ public class ObjectTypeController {
     private IObjectTypeService service;
 
     @PostMapping("")
-    public CommonResult<PageList<ObjectTypeDefine>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<ObjectTypeDefine>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
@@ -56,7 +55,7 @@ public class ObjectTypeController {
 	}
 
     @PostMapping("/createBatch")
-    public CommonResult<PageList<ObjectTypeDefine>> createBatch(@Valid @RequestBody List<ObjectTypeDefine> voList){
+    public CommonResult<List<ObjectTypeDefine>> createBatch(@Valid @RequestBody List<ObjectTypeDefine> voList){
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
     }
@@ -69,7 +68,7 @@ public class ObjectTypeController {
 	}
 
     @PostMapping("/updateBatch")
-    public CommonResult<PageList<ObjectTypeDefine>> updateBatch(@Valid @RequestBody List<ObjectTypeDefine> voList){
+    public CommonResult<List<ObjectTypeDefine>> updateBatch(@Valid @RequestBody List<ObjectTypeDefine> voList){
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }

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

@@ -7,7 +7,6 @@ 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.define.entity.RelationDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
@@ -18,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 对象类型 Controller
  * @author Charlie Yu
@@ -31,7 +32,7 @@ public class RelationDefineController {
     private IRelationDefineService service;
 
     @PostMapping("/query")
-    public CommonResult<PageList<RelationDefine>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<RelationDefine>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }

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

@@ -14,7 +14,6 @@ import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 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.digital.entity.ObjectDigital;
@@ -41,7 +40,7 @@ public class ObjectDigitalController {
     private IObjectDigitalService service;
 
     @PostMapping("/query")
-    public CommonResult<PageList<ObjectNode>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<ObjectNode>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
@@ -118,7 +117,7 @@ public class ObjectDigitalController {
     }
 
     @PostMapping("/create")
-    public CommonResult<PageList<ObjectDigital>> createBatch(@Valid @RequestBody ArrayNode array){
+    public CommonResult<List<ObjectDigital>> createBatch(@Valid @RequestBody ArrayNode array){
         List<ObjectDigital> voList = JsonNodeUtils.toEntity(array, ObjectDigital.class, "infos");
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
@@ -133,7 +132,7 @@ public class ObjectDigitalController {
     }
 
     @PostMapping("/update")
-    public CommonResult<PageList<ObjectDigital>> updateBatch(@Valid @RequestBody ArrayNode array){
+    public CommonResult<List<ObjectDigital>> updateBatch(@Valid @RequestBody ArrayNode array){
         List<ObjectDigital> voList = JsonNodeUtils.toEntity(array, ObjectDigital.class, "infos");
         voList = service.update(voList);
         return ResultHelper.multi(voList);

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

@@ -8,7 +8,6 @@ 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.digital.entity.ObjectRelation;
@@ -35,7 +34,7 @@ public class ObjectRelationController {
     private IObjectRelationService service;
 
     @PostMapping("query")
-    public CommonResult<PageList<ObjectRelation>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<ObjectRelation>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
@@ -56,7 +55,7 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/create")
-    public CommonResult<PageList<ObjectRelation>> createBatch(@Valid @RequestBody List<ObjectRelation> voList){
+    public CommonResult<List<ObjectRelation>> createBatch(@Valid @RequestBody List<ObjectRelation> voList){
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
     }
@@ -69,7 +68,7 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/update")
-    public CommonResult<PageList<ObjectRelation>> updateBatch(@Valid @RequestBody List<ObjectRelation> voList){
+    public CommonResult<List<ObjectRelation>> updateBatch(@Valid @RequestBody List<ObjectRelation> voList){
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }

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

@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("dt_relation")
+@TableName(value = "dt_relation", autoResultMap = true)
 public class ObjectRelation extends AuditableEntity {
     /** 项目ID */
     private String projectId;

+ 4 - 5
dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/controller/FileController.java

@@ -1,14 +1,13 @@
 package com.persagy.dmp.file.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dmp.common.lang.PsDateTime;
-import com.persagy.dmp.file.model.FileInfo;
-import com.persagy.dmp.file.service.IFileService;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.lang.PsDateTime;
 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.file.model.FileInfo;
+import com.persagy.dmp.file.service.IFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -80,7 +79,7 @@ public class FileController {
     }
 
     @PostMapping("/queryByBusiness")
-    public CommonResult<PageList<FileInfo>> queryByBusiness(@RequestBody String businessId) {
+    public CommonResult<List<FileInfo>> queryByBusiness(@RequestBody String businessId) {
         if(StrUtil.isBlank(businessId)) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }

+ 2 - 0
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/model/MessageType.java

@@ -2,6 +2,7 @@ package com.persagy.dmp.message.model;
 
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 消息类型
@@ -9,6 +10,7 @@ import lombok.Data;
  * @date 2021-05-24
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class MessageType extends BaseEntity {
 
     /** 消息类型编码 */

+ 2 - 0
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/model/MessageVO.java

@@ -2,6 +2,7 @@ package com.persagy.dmp.message.model;
 
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 消息
@@ -9,6 +10,7 @@ import lombok.Data;
  * @date 2021-05-24
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class MessageVO extends AuditableEntity {
 
     /** 消息类型 */

+ 2 - 0
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/model/SenderRegister.java

@@ -2,6 +2,7 @@ package com.persagy.dmp.message.model;
 
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 发送渠道注册信息
@@ -9,6 +10,7 @@ import lombok.Data;
  * @date 2021-05-26
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class SenderRegister extends BaseEntity {
 
     /** 发送渠道编码 */

+ 7 - 6
dmp-common/src/main/java/com/persagy/dmp/common/model/response/CommonResult.java

@@ -16,9 +16,10 @@ public class CommonResult<T> {
     /** 不需要提示 */
     public static final CommonResult SUCCESS = new CommonResult();
 
-    private String respCode;
-    private String respMsg;
-    private T content;
+    private String result;
+    private String message;
+    private T data;
+    private Long count;
 
     /**
      * 构造方法
@@ -43,9 +44,9 @@ public class CommonResult<T> {
      * @param content 数据
      */
     public CommonResult(String respCode, String respMsg, T content){
-        this.respCode = respCode;
-        this.respMsg = respMsg;
-        this.content = content;
+        this.result = respCode;
+        this.message = respMsg;
+        this.data = content;
     }
 
     public static <T> CommonResult<T> success(T t) {

+ 36 - 13
dmp-common/src/main/java/com/persagy/dmp/common/utils/ResultHelper.java

@@ -2,10 +2,8 @@ package com.persagy.dmp.common.utils;
 
 
 import cn.hutool.core.collection.CollUtil;
-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 java.util.List;
 
@@ -16,12 +14,18 @@ import java.util.List;
  */
 public class ResultHelper {
 
+    /** 成功 */
+    private static final String SUCCESS = "success";
+    /** 失败 */
+    private static final String FAIL = "fail";
+
     /**
      * 成功消息
      * @return
      */
     public static CommonResult success(){
-        return new CommonResult(ResponseCode.A00000.getCode(), ResponseCode.A00000.getDesc());
+//        return new CommonResult(ResponseCode.A00000.getCode(), ResponseCode.A00000.getDesc());
+        return success(null);
     }
 
     /**
@@ -29,7 +33,17 @@ public class ResultHelper {
      * @return
      */
     public static CommonResult success(String respMsg){
-        return new CommonResult(ResponseCode.A00000.getCode(), respMsg);
+//        return new CommonResult(ResponseCode.A00000.getCode(), respMsg);
+        return new CommonResult(SUCCESS, respMsg);
+    }
+
+    /**
+     * 失败消息
+     * @param respMsg
+     * @return
+     */
+    public static CommonResult failure(String respMsg) {
+        return failure(FAIL, respMsg);
     }
 
     /**
@@ -49,7 +63,7 @@ public class ResultHelper {
      * @return
      */
     public static <T> CommonResult<T> single(T content) {
-        return new CommonResult(ResponseCode.A00000.getCode(), ResponseCode.A00000.getDesc(), content);
+        return single(content, null);
     }
 
     /**
@@ -59,7 +73,8 @@ public class ResultHelper {
      * @return
      */
     public static <T> CommonResult<T> single(T content, String desc) {
-        return new CommonResult(ResponseCode.A00000.getCode(), desc, content);
+//        return new CommonResult(ResponseCode.A00000.getCode(), desc, content);
+        return new CommonResult(SUCCESS, desc, content);
     }
 
     /**
@@ -68,7 +83,7 @@ public class ResultHelper {
      * @param <T>
      * @return
      */
-    public static <T> CommonResult<PageList<T>> multi(List<T> records) {
+    public static <T> CommonResult<List<T>> multi(List<T> records) {
         return multi(records, CollUtil.size(records));
     }
 
@@ -91,14 +106,18 @@ public class ResultHelper {
      * @param <T>
      * @return
      */
-    public static <T> CommonResult<PageList<T>> multi(List<T> records, long total) {
+    public static <T> CommonResult<List<T>> multi(List<T> records, long total) {
         // 容错处理,出现总数比实际数少时,以实际数为准(page查询全部时,total为0)
         int size = CollUtil.size(records);
         if(total < CollUtil.size(records)) {
             total = size;
         }
-        PageList<T> pageList = new PageList<>(records, total);
-        return new CommonResult(ResponseCode.A00000.getCode(), ResponseCode.A00000.getDesc(), pageList);
+        CommonResult result = success();
+        result.setData(records);
+        result.setCount(total);
+        return result;
+//        PageList<T> pageList = new PageList<>(records, total);
+//        return new CommonResult(ResponseCode.A00000.getCode(), ResponseCode.A00000.getDesc(), pageList);
     }
 
     /**
@@ -108,9 +127,13 @@ public class ResultHelper {
      * @return 对应的结果
      */
     public static <T> T getContent(CommonResult<T> result) {
-        if(!ResponseCode.A00000.getCode().equals(result.getRespCode())) {
-            throw new BusinessException(result.getRespCode(), result.getRespMsg());
+//        if(!ResponseCode.A00000.getCode().equals(result.getRespCode())) {
+//            throw new BusinessException(result.getRespCode(), result.getRespMsg());
+//        }
+//        return result.getContent();
+        if(!SUCCESS.equals(result.getResult())) {
+            throw new BusinessException(result.getResult(), result.getMessage());
         }
-        return result.getContent();
+        return result.getData();
     }
 }

+ 4 - 3
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalDefineClient.java

@@ -1,15 +1,16 @@
 package com.persagy.dmp.define.client;
 
+import com.persagy.dmp.basic.config.DigitalFeignConfig;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.model.response.CommonResult;
-import com.persagy.dmp.common.model.response.PageList;
-import com.persagy.dmp.basic.config.DigitalFeignConfig;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 文件管理Client
  * @author Charlie Yu
@@ -28,7 +29,7 @@ public interface DigitalDefineClient {
      * @return 类型定义
      */
     @PostMapping("/define/type/query")
-    CommonResult<PageList<ObjectTypeDefine>> queryObjectType(
+    CommonResult<List<ObjectTypeDefine>> queryObjectType(
             @RequestParam("groupCode") String groupCode,
             @RequestParam("projectId") String projectId,
             @RequestParam("appId") String appId,

+ 4 - 3
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalDefineFacade.java

@@ -3,10 +3,11 @@ package com.persagy.dmp.define.client;
 import cn.hutool.extra.spring.SpringUtil;
 import com.persagy.dmp.basic.model.QueryCriteria;
 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.define.entity.ObjectTypeDefine;
 
+import java.util.List;
+
 /**
  * 数据字典Client门面
  * @author Charlie Yu
@@ -25,8 +26,8 @@ public class DigitalDefineFacade {
      * @param criteria 查询条件
      * @return 类型定义
      */
-    public static PageList<ObjectTypeDefine> queryObjectType(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
-        CommonResult<PageList<ObjectTypeDefine>> result = client.queryObjectType(groupCode, projectId, appId, userId, criteria);
+    public static List<ObjectTypeDefine> queryObjectType(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
+        CommonResult<List<ObjectTypeDefine>> result = client.queryObjectType(groupCode, projectId, appId, userId, criteria);
         return ResultHelper.getContent(result);
     }
 }

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

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("dt_define_graph")
+@TableName(value = "dt_define_graph", autoResultMap = true)
 public class GraphDefine extends AuditableEntity {
     /** 编码 */
     @NotNull(message = "编码不允许为空")

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

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("dt_define_info")
+@TableName(value = "dt_define_info", autoResultMap = true)
 public class ObjectInfoDefine extends AuditableEntity {
     /** 项目ID */
     private String projectId;

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

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("dt_define_type")
+@TableName(value = "dt_define_type", autoResultMap = true)
 public class ObjectTypeDefine extends AuditableEntity {
     /** 编码 */
     @NotNull(message = "编码不允许为空")

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

@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("dt_define_rel")
+@TableName(value = "dt_define_rel", autoResultMap = true)
 public class RelationDefine extends AuditableEntity {
     /** 编码 */
     private String code;

+ 2 - 0
dmp-comp/dmp-file-starter/src/main/java/com/persagy/dmp/file/model/FileInfo.java

@@ -3,6 +3,7 @@ package com.persagy.dmp.file.model;
 import com.persagy.dmp.common.lang.PsDate;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 文件对象
@@ -10,6 +11,7 @@ import lombok.Data;
  * @date 2021-05-15
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class FileInfo extends AuditableEntity {
 
     /** 集团编码:租户 */

+ 22 - 7
dmp-comp/dmp-mybatis/src/main/java/com/persagy/dmp/mybatis/typehandler/PsDateTimeTypeHandler.java

@@ -1,5 +1,6 @@
 package com.persagy.dmp.mybatis.typehandler;
 
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.common.lang.PsDateTime;
 import org.apache.ibatis.type.BaseTypeHandler;
@@ -7,10 +8,8 @@ import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedJdbcTypes;
 import org.apache.ibatis.type.MappedTypes;
 
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
+import java.time.format.DateTimeParseException;
 
 /**
  * Mybatis日期时间全局处理
@@ -29,18 +28,34 @@ public class PsDateTimeTypeHandler extends BaseTypeHandler<PsDateTime> {
     @Override
     public PsDateTime getNullableResult(ResultSet resultSet, String s) throws SQLException {
         String date = resultSet.getString(s);
-        return StrUtil.isBlank(date)? null:PsDateTime.parsePsDateTime(date);
+        return formatDateTime(date);
     }
 
     @Override
     public PsDateTime getNullableResult(ResultSet resultSet, int i) throws SQLException {
         String date = resultSet.getString(i);
-        return StrUtil.isBlank(date)? null:PsDateTime.parsePsDateTime(date);
+        return formatDateTime(date);
     }
 
     @Override
     public PsDateTime getNullableResult(CallableStatement callableStatement, int i) throws SQLException {
         String date = callableStatement.getString(i);
-        return StrUtil.isBlank(date)? null:PsDateTime.parsePsDateTime(date);
+        return formatDateTime(date);
+    }
+
+    /**
+     * 转换日期
+     * @param date
+     * @return
+     */
+    private PsDateTime formatDateTime(String date) {
+        if(StrUtil.isBlank(date)) {
+            return null;
+        }
+        try {
+            return PsDateTime.parsePsDateTime(date);
+        } catch (DateTimeParseException e) {
+            return new PsDateTime(date, DatePattern.NORM_DATETIME_PATTERN);
+        }
     }
 }

+ 1 - 1
dmp-comp/dmp-mybatis/src/main/java/com/persagy/dmp/mybatis/typehandler/PsDateTypeHandler.java

@@ -17,7 +17,7 @@ import java.sql.SQLException;
  * @author Charlie Yu
  * @version 1.0 2021-04-08
  */
-@MappedJdbcTypes({JdbcType.CHAR, JdbcType.TIMESTAMP})
+@MappedJdbcTypes({JdbcType.CHAR})
 @MappedTypes(PsDate.class)
 public class PsDateTypeHandler extends BaseTypeHandler<PsDate> {
 

+ 1 - 1
dmp-comp/dmp-mybatis/src/main/java/com/persagy/dmp/mybatis/typehandler/PsTimeTypeHandler.java

@@ -17,7 +17,7 @@ import java.sql.SQLException;
  * @author Charlie Yu
  * @version 1.0 2021-04-08
  */
-@MappedJdbcTypes({JdbcType.CHAR, JdbcType.TIMESTAMP})
+@MappedJdbcTypes({JdbcType.CHAR})
 @MappedTypes(PsTime.class)
 public class PsTimeTypeHandler extends BaseTypeHandler<PsTime> {