Browse Source

接口增加入参校验

linhuili 3 years ago
parent
commit
e6558142cb
16 changed files with 228 additions and 59 deletions
  1. 7 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/GraphDefineController.java
  2. 44 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java
  3. 44 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectTypeController.java
  4. 7 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/RelationDefineController.java
  5. 43 6
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java
  6. 35 5
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java
  7. 8 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/entity/ObjectDigital.java
  8. 10 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/entity/ObjectRelation.java
  9. 0 14
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/ObjectRelationIService.java
  10. 0 16
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/impl/ObjectRelationIServiceImpl.java
  11. 2 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectRelationService.java
  12. 0 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java
  13. 5 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectRelationServiceImpl.java
  14. 12 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoDefine.java
  15. 2 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectTypeDefine.java
  16. 9 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/RelationDefine.java

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

@@ -10,12 +10,14 @@ import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.GraphDefine;
 import com.persagy.dmp.rwd.define.service.IGraphDefineService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -43,19 +45,22 @@ public class GraphDefineController {
     }
 
     @PostMapping("/create")
-    public CommonResult<GraphDefine> create(@RequestBody GraphDefine vo){
+    public CommonResult<GraphDefine> create(@Valid @RequestBody GraphDefine vo){
         vo = service.insert(vo);
         return ResultHelper.single(vo);
     }
 
     @PostMapping("/update")
-    public CommonResult<GraphDefine> update(@RequestBody GraphDefine vo){
+    public CommonResult<GraphDefine> update(@Valid @RequestBody GraphDefine vo){
         vo = service.update(vo);
         return ResultHelper.single(vo);
     }
 
     @PostMapping("/delete")
     public void delete(@RequestBody String id){
+        if(StringUtils.isEmpty(id)){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
         service.delete(id);
     }
 }

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

@@ -5,13 +5,16 @@ 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.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.context.AppContext;
 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.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.rwd.define.service.IObjectInfoService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -55,12 +58,18 @@ public class ObjectInfoController {
     @PostMapping("/create")
     public CommonResult<ObjectInfoDefine> create(@Valid @RequestBody ObjectInfoDefine vo){
         List<ObjectInfoDefine> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //新增信息点
         service.insert(voList);
         return ResultHelper.single(vo);
     }
 
     @PostMapping("/createBatch")
     public CommonResult<List<ObjectInfoDefine>> createBatch(@Valid @RequestBody List<ObjectInfoDefine> voList){
+        //创建默认条件
+        createDefaultValue(voList);
+        //批量新增信息点
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
     }
@@ -68,25 +77,58 @@ public class ObjectInfoController {
     @PostMapping("/update")
     public CommonResult<ObjectInfoDefine> update(@Valid @RequestBody ObjectInfoDefine vo){
         List<ObjectInfoDefine> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改信息点
         service.update(voList);
         return ResultHelper.single(vo);
     }
 
     @PostMapping("/updateBatch")
     public CommonResult<List<ObjectInfoDefine>> updateBatch(@Valid @RequestBody List<ObjectInfoDefine> voList){
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改信息点
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }
 
     @PostMapping("/delete")
     public CommonResult delete(@RequestBody String id){
+        if(StringUtils.isEmpty(id)){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
         service.delete(CollUtil.newArrayList(id));
         return ResultHelper.success();
     }
 
     @PostMapping("/deleteBatch")
-    public CommonResult deleteBatch(@RequestBody List<String> id){
-        service.delete(id);
+    public CommonResult deleteBatch(@RequestBody List<String> ids){
+        if(ids == null || ids.size()<=0){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
+        service.delete(ids);
         return ResultHelper.success();
     }
+
+    /**
+     * 创建默认条件
+     * @param voList
+     */
+    private void createDefaultValue(List<ObjectInfoDefine> voList){
+        String groupCode = AppContext.getContext().getGroupCode();
+        if(StringUtils.isEmpty(groupCode)){
+            //默认集团
+            groupCode = CommonConstant.DEFAULT_ID;
+        }
+        String projectId = AppContext.getContext().getProjectId();
+        if(StringUtils.isEmpty(projectId)){
+            //默认项目
+            projectId = CommonConstant.DEFAULT_ID;
+        }
+        for (ObjectInfoDefine vo : voList) {
+            vo.setGroupCode(groupCode);
+            vo.setProjectId(projectId);
+        }
+    }
 }

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

@@ -5,13 +5,16 @@ 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.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.context.AppContext;
 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.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.rwd.define.service.IObjectTypeService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -50,12 +53,18 @@ public class ObjectTypeController {
     @PostMapping("/create")
 	public CommonResult<ObjectTypeDefine> create(@Valid @RequestBody ObjectTypeDefine vo){
         List<ObjectTypeDefine> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //新增类型定义
         service.insert(voList);
 		return ResultHelper.single(vo);
 	}
 
     @PostMapping("/createBatch")
     public CommonResult<List<ObjectTypeDefine>> createBatch(@Valid @RequestBody List<ObjectTypeDefine> voList){
+        //创建默认条件
+        createDefaultValue(voList);
+        //新增类型定义
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
     }
@@ -63,25 +72,58 @@ public class ObjectTypeController {
 	@PostMapping("/update")
 	public CommonResult<ObjectTypeDefine> update(@Valid @RequestBody ObjectTypeDefine vo){
         List<ObjectTypeDefine> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改类型定义
         service.update(voList);
 		return ResultHelper.single(vo);
 	}
 
     @PostMapping("/updateBatch")
     public CommonResult<List<ObjectTypeDefine>> updateBatch(@Valid @RequestBody List<ObjectTypeDefine> voList){
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改类型定义
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }
 
 	@PostMapping("/delete")
 	public CommonResult delete(@RequestBody String id){
+        if(StringUtils.isEmpty(id)){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
         service.delete(CollUtil.newArrayList(id));
         return ResultHelper.success();
 	}
 
     @PostMapping("/deleteBatch")
-    public CommonResult deleteBatch(@RequestBody List<String> id){
-        service.delete(id);
+    public CommonResult deleteBatch(@RequestBody List<String> ids){
+        if(ids == null || ids.size()<=0){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
+        service.delete(ids);
         return ResultHelper.success();
     }
+
+    /**
+     * 创建默认条件
+     * @param voList
+     */
+    private void createDefaultValue(List<ObjectTypeDefine> voList){
+        String groupCode = AppContext.getContext().getGroupCode();
+        if(StringUtils.isEmpty(groupCode)){
+            //默认集团
+            groupCode = CommonConstant.DEFAULT_ID;
+        }
+        String projectId = AppContext.getContext().getProjectId();
+        if(StringUtils.isEmpty(projectId)){
+            //默认项目
+            projectId = CommonConstant.DEFAULT_ID;
+        }
+        for (ObjectTypeDefine vo : voList) {
+            vo.setGroupCode(groupCode);
+            vo.setProjectId(projectId);
+        }
+    }
 }

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

@@ -11,12 +11,14 @@ 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.define.service.IRelationDefineService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -46,19 +48,22 @@ public class RelationDefineController {
     }
 
     @PostMapping("/create")
-    public CommonResult<RelationDefine> create(@RequestBody RelationDefine vo){
+    public CommonResult<RelationDefine> create(@Valid @RequestBody RelationDefine vo){
         vo = service.insert(vo);
         return ResultHelper.single(vo);
     }
 
     @PostMapping("/update")
-    public CommonResult<RelationDefine> update(@RequestBody RelationDefine vo){
+    public CommonResult<RelationDefine> update(@Valid @RequestBody RelationDefine vo){
         vo = service.update(vo);
         return ResultHelper.single(vo);
     }
 
     @PostMapping("/delete")
     public void delete(@RequestBody String id){
+        if(StringUtils.isEmpty(id)){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
         service.delete(id);
     }
 }

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

@@ -10,6 +10,7 @@ import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ParamCheckUtil;
@@ -18,6 +19,7 @@ import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.digital.utils.ObjectDigitalCriteriaHelper;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -64,9 +66,11 @@ public class ObjectDigitalController{
     public CommonResult<ObjectDigital> create(@Valid @RequestBody ObjectNode node){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-
         ObjectDigital vo = JsonNodeUtils.toEntity(node, ObjectDigital.class, ObjectDigital.EXTRA_COLUMN);
         List<ObjectDigital> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //新增对象信息
         service.insert(voList);
         return ResultHelper.single(vo);
     }
@@ -75,8 +79,10 @@ public class ObjectDigitalController{
     public CommonResult<List<ObjectDigital>> createBatch(@Valid @RequestBody ArrayNode array){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-
         List<ObjectDigital> voList = JsonNodeUtils.toEntity(array, ObjectDigital.class, ObjectDigital.EXTRA_COLUMN);
+        //创建默认条件
+        createDefaultValue(voList);
+        //批量新增对象信息
         voList = service.insert(voList);
         return ResultHelper.multi(voList);
     }
@@ -85,9 +91,11 @@ public class ObjectDigitalController{
     public CommonResult<ObjectDigital> update(@Valid @RequestBody ObjectNode node){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-
         ObjectDigital vo = JsonNodeUtils.toEntity(node, ObjectDigital.class, ObjectDigital.EXTRA_COLUMN);
         List<ObjectDigital> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改对象信息
         service.update(voList);
         return ResultHelper.single(vo);
     }
@@ -96,21 +104,50 @@ public class ObjectDigitalController{
     public CommonResult<List<ObjectDigital>> updateBatch(@Valid @RequestBody ArrayNode array){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-
         List<ObjectDigital> voList = JsonNodeUtils.toEntity(array, ObjectDigital.class, ObjectDigital.EXTRA_COLUMN);
+        //创建默认条件
+        createDefaultValue(voList);
+        //批量修改对象信息
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }
 
     @PostMapping("/deleteOne")
     public CommonResult delete(@RequestBody String id){
+        if(StringUtils.isEmpty(id)){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
         service.delete(CollUtil.newArrayList(id));
         return ResultHelper.success();
     }
 
     @PostMapping("/delete")
-    public CommonResult deleteBatch(@RequestBody List<String> id){
-        service.delete(id);
+    public CommonResult deleteBatch(@RequestBody List<String> ids){
+        if(ids == null || ids.size()<=0){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
+        service.delete(ids);
         return ResultHelper.success();
     }
+
+    /**
+     * 创建默认条件
+     * @param voList
+     */
+    private void createDefaultValue(List<ObjectDigital> voList){
+        String groupCode = AppContext.getContext().getGroupCode();
+        if(StringUtils.isEmpty(groupCode)){
+            //默认集团
+            groupCode = CommonConstant.DEFAULT_ID;
+        }
+        String projectId = AppContext.getContext().getProjectId();
+        if(StringUtils.isEmpty(projectId)){
+            //默认项目
+            projectId = CommonConstant.DEFAULT_ID;
+        }
+        for (ObjectDigital vo : voList) {
+            vo.setGroupCode(groupCode);
+            vo.setProjectId(projectId);
+        }
+    }
 }

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

@@ -7,14 +7,15 @@ import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
+import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ParamCheckUtil;
 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.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -57,8 +58,10 @@ public class ObjectRelationController {
     public CommonResult<ObjectRelation> create(@Valid @RequestBody ObjectRelation vo){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-
         List<ObjectRelation> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //新增对象关系
         service.insert(voList);
         return ResultHelper.single(vo);
     }
@@ -67,8 +70,10 @@ public class ObjectRelationController {
     public CommonResult<List<ObjectRelation>> createBatch(@Valid @RequestBody List<ObjectRelation> voList){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-
         voList = service.insert(voList);
+        //创建默认条件
+        createDefaultValue(voList);
+        //批量新增对象关系
         return ResultHelper.multi(voList);
     }
 
@@ -76,8 +81,10 @@ public class ObjectRelationController {
     public CommonResult<ObjectRelation> update(@Valid @RequestBody ObjectRelation vo){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-
         List<ObjectRelation> voList = CollUtil.newArrayList(vo);
+        //修改默认条件
+        createDefaultValue(voList);
+        //修改对象关系
         service.update(voList);
         return ResultHelper.single(vo);
     }
@@ -86,7 +93,9 @@ public class ObjectRelationController {
     public CommonResult<List<ObjectRelation>> updateBatch(@Valid @RequestBody List<ObjectRelation> voList){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-
+        //修改默认条件
+        createDefaultValue(voList);
+        //批量修改对象关系
         voList = service.update(voList);
         return ResultHelper.multi(voList);
     }
@@ -115,4 +124,25 @@ public class ObjectRelationController {
         List<ObjectRelation> delList = service.delete(wrapper);
         return ResultHelper.multi(delList,delList.size());
     }
+
+    /**
+     * 创建默认条件
+     * @param voList
+     */
+    private void createDefaultValue(List<ObjectRelation> voList){
+        String groupCode = AppContext.getContext().getGroupCode();
+        if(StringUtils.isEmpty(groupCode)){
+            //默认集团
+            groupCode = CommonConstant.DEFAULT_ID;
+        }
+        String projectId = AppContext.getContext().getProjectId();
+        if(StringUtils.isEmpty(projectId)){
+            //默认项目
+            projectId = CommonConstant.DEFAULT_ID;
+        }
+        for (ObjectRelation vo : voList) {
+            vo.setGroupCode(groupCode);
+            vo.setProjectId(projectId);
+        }
+    }
 }

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

@@ -7,7 +7,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -26,14 +28,20 @@ public class ObjectDigital extends AuditableEntity {
     /** 项目ID */
     private String projectId;
     /** 名称 */
+    @NotNull(message = "名称不允许为空")
+    @Length(max = 200)
     private String name;
     /** 本地编码 */
+    @Length(max = 40)
     private String localId;
     /** 本地名称 */
+    @Length(max = 200)
     private String localName;
     /** 对象分类 */
     private String objType;
     /** 类型编码 */
+    @NotNull(message = "类型编码不允许为空")
+    @Length(max = 40)
     private String classCode;
     /** 集团编码 */
     private String groupCode;

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 对象数据
@@ -16,11 +19,18 @@ import lombok.EqualsAndHashCode;
 public class ObjectRelation extends AuditableEntity {
     /** 项目ID */
     private String projectId;
+    /** 集团编码 */
+    private String groupCode;
     /** 图例ID */
+    @Length(max = 40)
     private String graphId;
     /** 图例编码 */
+    @NotNull(message = "图例编码不允许为空")
+    @Length(max = 40)
     private String graphCode;
     /** 关系编码 */
+    @NotNull(message = "关系编码不允许为空")
+    @Length(max = 40)
     private String relCode;
     /** 关系值 */
     private String relValue;

+ 0 - 14
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/ObjectRelationIService.java

@@ -1,14 +0,0 @@
-package com.persagy.dmp.rwd.digital.iservice;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.persagy.dmp.define.entity.RelationDefine;
-import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
-
-/**
- * 对象关系-IService
- * @author linhuili
- * @date 2021-08-17
- */
-public interface ObjectRelationIService extends IService<ObjectRelation> {
-
-}

+ 0 - 16
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/impl/ObjectRelationIServiceImpl.java

@@ -1,16 +0,0 @@
-package com.persagy.dmp.rwd.digital.iservice.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper;
-import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
-import com.persagy.dmp.rwd.digital.iservice.ObjectRelationIService;
-import org.springframework.stereotype.Service;
-
-/**
- * 对象关系-IService
- * @author linhuili
- * @date 2021-08-17
- */
-@Service
-public class ObjectRelationIServiceImpl extends ServiceImpl<ObjectRelationMapper, ObjectRelation> implements ObjectRelationIService {
-}

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

@@ -3,6 +3,7 @@ package com.persagy.dmp.rwd.digital.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
 
 import java.util.List;
@@ -12,7 +13,7 @@ import java.util.List;
  * @author Charlie Yu
  * @date 2021-07-08
  */
-public interface IObjectRelationService {
+public interface IObjectRelationService extends IService<ObjectRelation> {
 
     /**
      * 按条件查询

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

@@ -78,10 +78,6 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
         voList.forEach(vo -> {
             // 生成ID
             vo.setId(DigitalCommonUtils.fetchObjectId(vo.getProjectId(), vo.getObjType()));
-            //设置项目id
-            vo.setProjectId(AppContext.getContext().getProjectId());
-            //设置集团编码
-            vo.setGroupCode(AppContext.getContext().getGroupCode());
             //设置对象类型-objType
             vo.setObjType(typeMap.get(vo.getClassCode()));
             vo.setValid(ValidEnum.TRUE.getType());

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

@@ -3,12 +3,11 @@ package com.persagy.dmp.rwd.digital.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.persagy.dmp.common.constant.ValidEnum;
-import com.persagy.dmp.define.entity.RelationDefine;
 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.iservice.ObjectRelationIService;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,14 +24,16 @@ import java.util.List;
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class ObjectRelationServiceImpl implements IObjectRelationService {
+public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper, ObjectRelation> implements IObjectRelationService  {
 
     @Resource
     private ObjectRelationMapper dao;
+
     @Autowired
     private DigitalMessageHelper messageSender;
+
     @Autowired
-    private ObjectRelationIService iService;
+    private IObjectRelationService iService;
 
     /**
      * 查询对象关系数据

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

@@ -7,6 +7,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 信息点定义
@@ -20,14 +23,23 @@ public class ObjectInfoDefine extends AuditableEntity {
     /** 项目ID */
     private String projectId;
     /** 信息点编码 */
+    @NotNull(message = "编码不允许为空")
+    @Length(max = 40)
     private String code;
     /** 信息点名称 */
+    @NotNull(message = "名称不允许为空")
+    @Length(max = 200)
     private String name;
     /** 别名编码 */
+    @NotNull(message = "别名编码不允许为空")
+    @Length(max = 40)
     private String aliasCode;
     /** 别名名称 */
+    @NotNull(message = "别名名称不允许为空")
+    @Length(max = 200)
     private String aliasName;
     /** 类型编码 */
+    @NotNull(message = "类型编码不允许为空")
     private String classCode;
     /** 集团编码 */
     private String groupCode;

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

@@ -37,7 +37,8 @@ public class ObjectTypeDefine extends AuditableEntity {
      * system-系统, equipment-设备, shaft-竖井, component-部件,
      * virtual-虚拟, tool-工具, material-耗材
      **/
-    @NotNull
+    @NotNull(message = "对象类型不允许为空")
+    @Length(max = 40)
     private String objType;
     //** 管理层级:common-平台级,group-集团级,project-项目级 */
     //private String type;

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 关系定义
@@ -15,10 +18,16 @@ import lombok.EqualsAndHashCode;
 @TableName(value = "dt_define_rel", autoResultMap = true)
 public class RelationDefine extends AuditableEntity {
     /** 编码 */
+    @NotNull(message = "编码不允许为空")
+    @Length(max = 40)
     private String code;
     /** 名称 */
+    @NotNull(message = "名称不允许为空")
+    @Length(max = 200)
     private String name;
     /** 图类型编码 */
+    @NotNull(message = "图类型编码不允许为空")
+    @Length(max = 40)
     private String graphCode;
     /** 边方向性 */
     private Integer directional;