Browse Source

交付范围相关接口开发

linhuili 3 years ago
parent
commit
4eb20400b2
16 changed files with 950 additions and 51 deletions
  1. 16 11
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoCollectController.java
  2. 177 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/controller/ObjectTypeCollectController.java
  3. 180 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/controller/RelationDefineCollectController.java
  4. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/dao/ObjectInfoCollectMapper.java
  5. 14 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/dao/ObjectTypeCollectMapper.java
  6. 13 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/dao/RelationDefineCollectMapper.java
  7. 3 4
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IObjectInfoCollectService.java
  8. 58 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/service/IObjectTypeCollectService.java
  9. 58 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/service/IRelationDefineCollectService.java
  10. 6 9
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/ObjectInfoCollectServiceImpl.java
  11. 145 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/service/impl/ObjectTypeCollectServiceImpl.java
  12. 110 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/service/impl/RelationDefineCollectServiceImpl.java
  13. 66 19
      dmp-business/dmp-rwd/src/main/resources/db/init/schema.sql
  14. 14 5
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoCollect.java
  15. 41 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/delivery/entity/ObjectTypeCollect.java
  16. 46 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/delivery/entity/RelationDefineCollect.java

+ 16 - 11
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoCollectController.java

@@ -1,8 +1,10 @@
-package com.persagy.dmp.rwd.define.controller;
+package com.persagy.dmp.rwd.delivery.controller;
 
 import cn.hutool.core.collection.CollUtil;
+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.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.CommonConstant;
@@ -11,8 +13,8 @@ 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.ObjectInfoCollect;
-import com.persagy.dmp.rwd.define.service.IObjectInfoCollectService;
+import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
+import com.persagy.dmp.rwd.delivery.service.IObjectInfoCollectService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +26,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 平台、项目级信息点采集
+ * 项目,现场交付范围管理-信息点
  * @author:linhuili
  * @date:2021/10/13
  */
@@ -36,7 +38,7 @@ public class ObjectInfoCollectController {
     private IObjectInfoCollectService service;
 
     /**
-     * 查询采集的信息点
+     * 查询信息点交付范围
      * @param criteria
      * @return
      */
@@ -45,10 +47,13 @@ public class ObjectInfoCollectController {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
+        // deliveryType 字段预留,暂不根据此字段查询
+        criteria.getCriteria().remove("deliveryType");
         QueryWrapper<ObjectInfoCollect> wrapper = new QueryWrapper<>();
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectInfoCollect.class);
         Page page = QueryCriteriaHelper.toPage(criteria);
+
         if(criteria.isOnlyCount()) {
             Integer total = service.queryCount(wrapper);
             page.setTotal(total);
@@ -60,7 +65,7 @@ public class ObjectInfoCollectController {
 
 
     /**
-     * 添加采集的信息点
+     * 添加信息点交付范围
      * @param vo
      * @return
      */
@@ -75,7 +80,7 @@ public class ObjectInfoCollectController {
     }
 
     /**
-     * 批量添加采集的信息点
+     * 批量信息点交付范围
      * @param voList
      * @return
      */
@@ -89,7 +94,7 @@ public class ObjectInfoCollectController {
     }
 
     /**
-     * 修改采集的信息点
+     * 修改信息点交付范围
      * @param vo
      * @return
      */
@@ -104,7 +109,7 @@ public class ObjectInfoCollectController {
     }
 
     /**
-     * 批量修改采集的信息点
+     * 批量修改信息点交付范围
      * @param voList
      * @return
      */
@@ -118,7 +123,7 @@ public class ObjectInfoCollectController {
     }
 
     /**
-     * 删除采集的信息点
+     * 删除信息点交付范围
      * @param id
      * @return
      */
@@ -132,7 +137,7 @@ public class ObjectInfoCollectController {
     }
 
     /**
-     * 批量删除采集的信息点
+     * 批量删除信息点交付范围
      * @param ids
      * @return
      */

+ 177 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/controller/ObjectTypeCollectController.java

@@ -0,0 +1,177 @@
+package com.persagy.dmp.rwd.delivery.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.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.delivery.entity.ObjectTypeCollect;
+import com.persagy.dmp.rwd.delivery.service.IObjectTypeCollectService;
+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;
+
+/**
+ * 项目,现场交付范围管理-对象类型
+ * @author:linhuili
+ * @date:2021/10/13
+ */
+@RestController
+@RequestMapping("/rwd/def/type/collect")
+public class ObjectTypeCollectController {
+
+    @Autowired
+    private IObjectTypeCollectService service;
+
+
+    /**
+     * 查询对象类型交付范围
+     * @param criteria
+     * @return
+     */
+    @PostMapping("/query")
+    public CommonResult<List<ObjectTypeCollect>> query(@RequestBody QueryCriteria criteria) {
+        if(criteria == null) {
+            throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
+        }
+        QueryWrapper<ObjectTypeCollect> wrapper = new QueryWrapper<>();
+        // 转换查询条件
+        QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectTypeCollect.class);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
+        return ResultHelper.multi(page.getRecords(), page.getTotal());
+    }
+
+    /**
+     * 添加对象类型交付范围
+     * @param vo
+     * @return
+     */
+    @PostMapping("/create")
+    public CommonResult<ObjectTypeCollect> create(@Valid @RequestBody ObjectTypeCollect vo) throws Exception{
+        List<ObjectTypeCollect> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //新增信息点
+        service.insert(voList);
+        return ResultHelper.single(vo);
+    }
+
+    /**
+     * 批量添加对象类型交付范围
+     * @param voList
+     * @return
+     */
+    @PostMapping("/createBatch")
+    public CommonResult<List<ObjectTypeCollect>> createBatch(@Valid @RequestBody List<ObjectTypeCollect> voList) throws Exception{
+        //创建默认条件
+        createDefaultValue(voList);
+        //批量新增信息点
+        voList = service.insert(voList);
+        return ResultHelper.multi(voList);
+    }
+
+    /**
+     * 修改对象类型交付范围
+     * @param vo
+     * @return
+     */
+    @PostMapping("/update")
+    public CommonResult<ObjectTypeCollect> update(@Valid @RequestBody ObjectTypeCollect vo) throws Exception{
+        List<ObjectTypeCollect> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改信息点
+        service.update(voList);
+        return ResultHelper.single(vo);
+    }
+
+    /**
+     * 批量修改对象类型交付范围
+     * @param voList
+     * @return
+     */
+    @PostMapping("/updateBatch")
+    public CommonResult<List<ObjectTypeCollect>> updateBatch(@Valid @RequestBody List<ObjectTypeCollect> voList) throws Exception{
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改信息点
+        voList = service.update(voList);
+        return ResultHelper.multi(voList);
+    }
+
+    /**
+     * 删除对象类型交付范围
+     * @param id
+     * @return
+     */
+    @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();
+    }
+
+    /**
+     * 批量删除对象类型交付范围
+     * @param ids
+     * @return
+     */
+    @PostMapping("/deleteBatch")
+    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<ObjectTypeCollect> 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 (ObjectTypeCollect vo : voList) {
+            if(StringUtils.isEmpty(vo.getGroupCode())){
+                vo.setGroupCode(groupCode);
+            }
+            if(StringUtils.isEmpty(vo.getProjectId())){
+                vo.setProjectId(projectId);
+            }
+            //默认有效标识
+            if(vo.getValid() == null){
+                vo.setValid(1);
+            }
+        }
+    }
+
+}

+ 180 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/controller/RelationDefineCollectController.java

@@ -0,0 +1,180 @@
+package com.persagy.dmp.rwd.delivery.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.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.delivery.entity.RelationDefineCollect;
+import com.persagy.dmp.rwd.delivery.service.IRelationDefineCollectService;
+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;
+
+/**
+ * 项目,现场交付范围管理-关系
+ * @author:linhuili
+ * @date:2021/10/13
+ */
+@RestController
+@RequestMapping("/rwd/def/rel/collect")
+public class RelationDefineCollectController {
+
+    @Autowired
+    private IRelationDefineCollectService service;
+
+
+    /**
+     * 查询采集的信息点
+     * @param criteria
+     * @return
+     */
+    @PostMapping("/query")
+    public CommonResult<List<RelationDefineCollect>> query(@RequestBody QueryCriteria criteria) {
+        if(criteria == null) {
+            throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
+        }
+        // deliveryType 字段预留,暂不根据此字段查询
+        criteria.getCriteria().remove("deliveryType");
+
+        QueryWrapper<RelationDefineCollect> wrapper = new QueryWrapper<>();
+        // 转换查询条件
+        QueryCriteriaHelper.toWrapper(wrapper, criteria, RelationDefineCollect.class);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            Integer total = service.queryCount(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
+        return ResultHelper.multi(page.getRecords(), page.getTotal());
+    }
+
+    /**
+     * 添加采集的信息点
+     * @param vo
+     * @return
+     */
+    @PostMapping("/create")
+    public CommonResult<RelationDefineCollect> create(@Valid @RequestBody RelationDefineCollect vo) throws Exception{
+        List<RelationDefineCollect> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //新增信息点
+        service.insert(voList);
+        return ResultHelper.single(vo);
+    }
+
+    /**
+     * 批量添加采集的信息点
+     * @param voList
+     * @return
+     */
+    @PostMapping("/createBatch")
+    public CommonResult<List<RelationDefineCollect>> createBatch(@Valid @RequestBody List<RelationDefineCollect> voList) throws Exception{
+        //创建默认条件
+        createDefaultValue(voList);
+        //批量新增信息点
+        voList = service.insert(voList);
+        return ResultHelper.multi(voList);
+    }
+
+    /**
+     * 修改采集的信息点
+     * @param vo
+     * @return
+     */
+    @PostMapping("/update")
+    public CommonResult<RelationDefineCollect> update(@Valid @RequestBody RelationDefineCollect vo) throws Exception{
+        List<RelationDefineCollect> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改信息点
+        service.update(voList);
+        return ResultHelper.single(vo);
+    }
+
+    /**
+     * 批量修改采集的信息点
+     * @param voList
+     * @return
+     */
+    @PostMapping("/updateBatch")
+    public CommonResult<List<RelationDefineCollect>> updateBatch(@Valid @RequestBody List<RelationDefineCollect> voList) throws Exception{
+        //创建默认条件
+        createDefaultValue(voList);
+        //修改信息点
+        voList = service.update(voList);
+        return ResultHelper.multi(voList);
+    }
+
+    /**
+     * 删除采集的信息点
+     * @param id
+     * @return
+     */
+    @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();
+    }
+
+    /**
+     * 批量删除采集的信息点
+     * @param ids
+     * @return
+     */
+    @PostMapping("/deleteBatch")
+    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<RelationDefineCollect> 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 (RelationDefineCollect vo : voList) {
+            if(StringUtils.isEmpty(vo.getGroupCode())){
+                vo.setGroupCode(groupCode);
+            }
+            if(StringUtils.isEmpty(vo.getProjectId())){
+                vo.setProjectId(projectId);
+            }
+            //默认有效标识
+            if(vo.getValid() == null){
+                vo.setValid(1);
+            }
+        }
+    }
+
+}

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/dao/ObjectInfoCollectMapper.java

@@ -1,10 +1,10 @@
-package com.persagy.dmp.rwd.define.dao;
+package com.persagy.dmp.rwd.delivery.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dmp.define.entity.ObjectInfoCollect;
+import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
 
 /**
- * 平台/项目级信息点采集 DAO
+ * 项目,现场交付范围管理-信息点 DAO
  * @author:linhuili
  * @date:2021/10/13
  */

+ 14 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/dao/ObjectTypeCollectMapper.java

@@ -0,0 +1,14 @@
+package com.persagy.dmp.rwd.delivery.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
+import com.persagy.dmp.delivery.entity.ObjectTypeCollect;
+
+/**
+ * 平台/项目级信息点采集 DAO
+ * @author:linhuili
+ * @date:2021/10/13
+ */
+public interface ObjectTypeCollectMapper extends BaseMapper<ObjectTypeCollect> {
+
+}

+ 13 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/dao/RelationDefineCollectMapper.java

@@ -0,0 +1,13 @@
+package com.persagy.dmp.rwd.delivery.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.dmp.delivery.entity.RelationDefineCollect;
+
+/**
+ * 平台/项目级信息点采集 DAO
+ * @author:linhuili
+ * @date:2021/10/13
+ */
+public interface RelationDefineCollectMapper extends BaseMapper<RelationDefineCollect> {
+
+}

+ 3 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IObjectInfoCollectService.java

@@ -1,15 +1,14 @@
-package com.persagy.dmp.rwd.define.service;
+package com.persagy.dmp.rwd.delivery.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.persagy.dmp.define.entity.GraphDefine;
-import com.persagy.dmp.define.entity.ObjectInfoCollect;
+import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
 
 import java.util.List;
 
 /**
- * 平台、项目级信息点采集
+ * 项目,现场交付范围管理-信息点
  * @author:linhuili
  * @date:2021/10/13
  */

+ 58 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/service/IObjectTypeCollectService.java

@@ -0,0 +1,58 @@
+package com.persagy.dmp.rwd.delivery.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.persagy.dmp.delivery.entity.ObjectTypeCollect;
+
+import java.util.List;
+
+/**
+ * 项目,现场交付范围管理-对象类型
+ * @author:linhuili
+ * @date:2021/10/13
+ */
+public interface IObjectTypeCollectService extends IService<ObjectTypeCollect> {
+
+    /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<ObjectTypeCollect> queryWrapper);
+
+    /**
+     * 按条件查询
+     * @param queryWrapper 查询条件
+     * @return 返回结果
+     */
+    List<ObjectTypeCollect> queryByCondition(Wrapper<ObjectTypeCollect> queryWrapper);
+
+    /**
+     * 分页条件查询
+     * @param page 分页条件
+     * @param queryWrapper 查询条件
+     * @return 分页结果
+     */
+    Page queryByCondition(Page page, Wrapper<ObjectTypeCollect> queryWrapper);
+
+    /**
+     * 新增
+     * @param voList 待新增数据
+     * @return 新增后数据
+     */
+    List<ObjectTypeCollect> insert(List<ObjectTypeCollect> voList) throws Exception ;
+
+    /**
+     * 修改
+     * @param voList 待修改数据
+     * @return 修改后数据
+     */
+    List<ObjectTypeCollect> update(List<ObjectTypeCollect> voList) throws Exception;
+
+    /**
+     * 删除
+     * @param idList 主键
+     */
+    void delete(List<String> idList);
+}

+ 58 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/service/IRelationDefineCollectService.java

@@ -0,0 +1,58 @@
+package com.persagy.dmp.rwd.delivery.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.persagy.dmp.delivery.entity.RelationDefineCollect;
+
+import java.util.List;
+
+/**
+ * 项目,现场交付范围管理-关系
+ * @author:linhuili
+ * @date:2021/10/13
+ */
+public interface IRelationDefineCollectService extends IService<RelationDefineCollect> {
+
+    /**
+     * 按条件计数
+     * @param queryWrapper 查询条件
+     * @return 结果数量
+     */
+    Integer queryCount(Wrapper<RelationDefineCollect> queryWrapper);
+
+    /**
+     * 按条件查询
+     * @param queryWrapper 查询条件
+     * @return 返回结果
+     */
+    List<RelationDefineCollect> queryByCondition(Wrapper<RelationDefineCollect> queryWrapper);
+
+    /**
+     * 分页条件查询
+     * @param page 分页条件
+     * @param queryWrapper 查询条件
+     * @return 分页结果
+     */
+    Page queryByCondition(Page page, Wrapper<RelationDefineCollect> queryWrapper);
+
+    /**
+     * 新增
+     * @param voList 待新增数据
+     * @return 新增后数据
+     */
+    List<RelationDefineCollect> insert(List<RelationDefineCollect> voList) throws Exception ;
+
+    /**
+     * 修改
+     * @param voList 待修改数据
+     * @return 修改后数据
+     */
+    List<RelationDefineCollect> update(List<RelationDefineCollect> voList) throws Exception;
+
+    /**
+     * 删除
+     * @param idList 主键
+     */
+    void delete(List<String> idList);
+}

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

@@ -1,4 +1,4 @@
-package com.persagy.dmp.rwd.define.service.impl;
+package com.persagy.dmp.rwd.delivery.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -9,10 +9,10 @@ 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.common.model.entity.BaseEntity;
-import com.persagy.dmp.define.entity.ObjectInfoCollect;
-import com.persagy.dmp.rwd.define.dao.ObjectInfoCollectMapper;
-import com.persagy.dmp.rwd.define.service.IObjectInfoCollectService;
+import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
 import com.persagy.dmp.rwd.define.service.IObjectInfoService;
+import com.persagy.dmp.rwd.delivery.dao.ObjectInfoCollectMapper;
+import com.persagy.dmp.rwd.delivery.service.IObjectInfoCollectService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,19 +21,16 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 平台、项目级信息点采集
+ * 项目,现场交付范围管理-信息点
  * @author:linhuili
  * @date:2021/10/13
  */
 @Service
-public class ObjectInfoCollectServiceImpl extends ServiceImpl<ObjectInfoCollectMapper,ObjectInfoCollect> implements IObjectInfoCollectService {
+public class ObjectInfoCollectServiceImpl extends ServiceImpl<ObjectInfoCollectMapper, ObjectInfoCollect> implements IObjectInfoCollectService {
 
     @Autowired
     private ObjectInfoCollectMapper objectInfoCollectMapper;
 
-    @Autowired
-    private IObjectInfoService objectInfoService;
-
     /**
      * 数量统计
      * @param queryWrapper 查询条件

+ 145 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/service/impl/ObjectTypeCollectServiceImpl.java

@@ -0,0 +1,145 @@
+package com.persagy.dmp.rwd.delivery.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.delivery.entity.ObjectTypeCollect;
+import com.persagy.dmp.rwd.delivery.service.IObjectTypeCollectService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目,现场交付范围管理-对象类型
+ * @author:linhuili
+ * @date:2021/10/13
+ */
+@Service
+public class ObjectTypeCollectServiceImpl extends ServiceImpl<com.persagy.dmp.rwd.delivery.dao.ObjectTypeCollectMapper, ObjectTypeCollect> implements IObjectTypeCollectService {
+
+    @Autowired
+    private com.persagy.dmp.rwd.delivery.dao.ObjectTypeCollectMapper ObjectTypeCollectMapper;
+
+    /**
+     * 数量统计
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public Integer queryCount(Wrapper<ObjectTypeCollect> queryWrapper) {
+        return ObjectTypeCollectMapper.selectCount(queryWrapper);
+    }
+
+    /**
+     * 查询对象类型交付范围
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public List<ObjectTypeCollect> queryByCondition(Wrapper<ObjectTypeCollect> queryWrapper) {
+        return ObjectTypeCollectMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 分页查询对象类型交付范围
+     * @param page 分页条件
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public Page queryByCondition(Page page, Wrapper<ObjectTypeCollect> queryWrapper) {
+        return ObjectTypeCollectMapper.selectPage(page, queryWrapper);
+    }
+
+    /**
+     * 设定对象类型交付范围
+     * @param voList 待新增数据
+     * @return
+     */
+    @Override
+    public List<ObjectTypeCollect> insert(List<ObjectTypeCollect> voList) throws Exception{
+        //填充信息点采集ID
+        fillObjectTypeCollectId(voList);
+        //新增采集信息点
+        saveOrUpdateBatch(voList);
+        return voList;
+    }
+
+    /**
+     * 修改对象类型交付范围
+     * @param voList 待修改数据
+     * @return
+     */
+    @Override
+    public List<ObjectTypeCollect> update(List<ObjectTypeCollect> voList) throws Exception {
+        //填充信息点采集ID
+        fillObjectTypeCollectId(voList);
+        //修改采集信息点
+        saveOrUpdateBatch(voList);
+        return voList;
+    }
+
+    /**
+     * 删除对象类型交付范围
+     * @param idList 主键
+     */
+    @Override
+    public void delete(List<String> idList) {
+        if(CollUtil.isEmpty(idList)) {
+            return;
+        }
+        List<ObjectTypeCollect> dbList = ObjectTypeCollectMapper.selectBatchIds(idList);
+        Map<String, ObjectTypeCollect> dbMap = CollectionUtil.fieldValueMap(dbList, BaseEntity.PROP_ID);
+        idList.forEach(id -> {
+            ObjectTypeCollect dbVO = MapUtil.get(dbMap, id, ObjectTypeCollect.class);
+            // 容错处理
+            if(dbVO == null) {
+                return;
+            }
+            // 删除
+            ObjectTypeCollect vo = new ObjectTypeCollect();
+            vo.setId(id);
+            vo.setValid(ValidEnum.FALSE.getType());
+            ObjectTypeCollectMapper.updateById(vo);
+        });
+    }
+
+    /**
+     * 填充已交付的对象类ID
+     * @param voList
+     */
+    private void fillObjectTypeCollectId(List<ObjectTypeCollect> voList){
+        if(CollUtil.isEmpty(voList)){
+            return;
+        }
+        for (ObjectTypeCollect typeCollect : voList) {
+            if(StringUtils.isNotEmpty(typeCollect.getId()) || StringUtils.isEmpty(typeCollect.getDefineTypeId())){
+                continue;
+            }
+            //查询采集信息点
+            LambdaQueryWrapper<ObjectTypeCollect> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(ObjectTypeCollect::getGroupCode,typeCollect.getGroupCode());
+            wrapper.eq(ObjectTypeCollect::getProjectId,typeCollect.getProjectId());
+            wrapper.eq(ObjectTypeCollect::getDeliveryType,typeCollect.getDeliveryType());
+            wrapper.eq(ObjectTypeCollect::getDefineTypeId,typeCollect.getDefineTypeId());
+            wrapper.eq(ObjectTypeCollect::getValid,true);
+            List<ObjectTypeCollect> ObjectTypeCollects = queryByCondition(wrapper);
+            if(CollUtil.isEmpty(ObjectTypeCollects)){
+                //信息点未被采集
+                continue;
+            }else{
+                //信息点已采集
+                typeCollect.setId(ObjectTypeCollects.get(0).getId());
+            }
+        }
+    }
+}

+ 110 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/delivery/service/impl/RelationDefineCollectServiceImpl.java

@@ -0,0 +1,110 @@
+package com.persagy.dmp.rwd.delivery.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.common.model.entity.BaseEntity;
+import com.persagy.dmp.delivery.entity.RelationDefineCollect;
+import com.persagy.dmp.rwd.delivery.dao.RelationDefineCollectMapper;
+import com.persagy.dmp.rwd.delivery.service.IRelationDefineCollectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目,现场交付范围管理-关系
+ * @author:linhuili
+ * @date:2021/10/13
+ */
+@Service
+public class RelationDefineCollectServiceImpl extends ServiceImpl<RelationDefineCollectMapper, RelationDefineCollect> implements IRelationDefineCollectService {
+
+    @Autowired
+    private RelationDefineCollectMapper relationDefineCollectMapper;
+
+    /**
+     * 数量统计
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public Integer queryCount(Wrapper<RelationDefineCollect> queryWrapper) {
+        return relationDefineCollectMapper.selectCount(queryWrapper);
+    }
+
+    /**
+     * 查询信息点交付范围
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public List<RelationDefineCollect> queryByCondition(Wrapper<RelationDefineCollect> queryWrapper) {
+        return relationDefineCollectMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 分页询信息点交付范围
+     * @param page 分页条件
+     * @param queryWrapper 查询条件
+     * @return
+     */
+    @Override
+    public Page queryByCondition(Page page, Wrapper<RelationDefineCollect> queryWrapper) {
+        return relationDefineCollectMapper.selectPage(page, queryWrapper);
+    }
+
+    /**
+     * 新增信息点交付范围
+     * @param voList 待新增数据
+     * @return
+     */
+    @Override
+    public List<RelationDefineCollect> insert(List<RelationDefineCollect> voList) throws Exception{
+        //新增采集信息点
+        saveOrUpdateBatch(voList);
+        return voList;
+    }
+
+    /**
+     * 修改信息点交付范围
+     * @param voList 待修改数据
+     * @return
+     */
+    @Override
+    public List<RelationDefineCollect> update(List<RelationDefineCollect> voList) throws Exception {
+        //修改采集信息点
+        saveOrUpdateBatch(voList);
+        return voList;
+    }
+
+    /**
+     * 删除信息点交付范围
+     * @param idList 主键
+     */
+    @Override
+    public void delete(List<String> idList) {
+        if(CollUtil.isEmpty(idList)) {
+            return;
+        }
+        List<RelationDefineCollect> dbList = relationDefineCollectMapper.selectBatchIds(idList);
+        Map<String, RelationDefineCollect> dbMap = CollectionUtil.fieldValueMap(dbList, BaseEntity.PROP_ID);
+        idList.forEach(id -> {
+            RelationDefineCollect dbVO = MapUtil.get(dbMap, id, RelationDefineCollect.class);
+            // 容错处理
+            if(dbVO == null) {
+                return;
+            }
+            // 删除
+            RelationDefineCollect vo = new RelationDefineCollect();
+            vo.setId(id);
+            vo.setValid(ValidEnum.FALSE.getType());
+            relationDefineCollectMapper.updateById(vo);
+        });
+    }
+}

+ 66 - 19
dmp-business/dmp-rwd/src/main/resources/db/init/schema.sql

@@ -219,24 +219,6 @@ CREATE TABLE IF NOT EXISTS `dt_equip_class_rel`  (
  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB COMMENT = '项目设备类边关系表' ROW_FORMAT = Dynamic;
 
-CREATE TABLE IF NOT EXISTS `dt_define_info_collect`  (
-`id` varchar(40) NOT NULL,
-`define_info_id` varchar(40) NULL DEFAULT NULL,
-`project_id` varchar(40) NULL DEFAULT NULL,
-`group_code` varchar(40) NULL DEFAULT NULL COMMENT '集团编码',
-`visiable` int NULL DEFAULT NULL COMMENT '是否可见 1- 可见 0-不可见',
-`code` varchar(40) NULL DEFAULT NULL COMMENT '信息点',
-`class_code` varchar(40) NULL DEFAULT NULL COMMENT '类型编码',
-`creator` varchar(32) NULL DEFAULT NULL COMMENT '创建人',
-`creation_time` char(14) NULL DEFAULT NULL COMMENT '创建时间',
-`modifier` varchar(32) NULL DEFAULT NULL COMMENT '最后修改人',
-`modified_time` char(14) NULL DEFAULT NULL COMMENT '最后修改时间',
-`valid` tinyint NULL DEFAULT NULL COMMENT '合法标识',
-`ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
-`key_word` int(1) DEFAULT NULL COMMENT '是否为关键信息点',
-PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB ROW_FORMAT = Dynamic COMMENT = '采集信息点配置表' ;
-
 CREATE TABLE IF NOT EXISTS `dt_object_his` (
     `id` varchar(100) NOT NULL COMMENT '主键',
     `obj_id` varchar(100) DEFAULT NULL COMMENT '对象id',
@@ -326,4 +308,69 @@ CREATE TABLE IF NOT EXISTS `dt_sync_data` (
    `valid` tinyint NULL DEFAULT 1 COMMENT '合法标识',
    `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
    PRIMARY KEY (`id`)
-) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='adm交付数据同步到项目现场';
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='adm交付数据同步到项目现场';
+
+CREATE TABLE IF NOT EXISTS `dt_define_type_collect` (
+  `id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '主键ID',
+  `group_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '集团编码',
+  `project_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID',
+  `define_type_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型ID',
+  `code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对象类型编码',
+  `obj_type` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对象类型',
+  `delivery_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '交付类型:0-项目交付 1-现场交付',
+  `is_delivery` tinyint(1) DEFAULT NULL COMMENT '是否交付 0-否 1-是',
+  `instance_scope` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围:实例范围',
+  `association_relation` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围:依赖&关联',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '交付范围:备注',
+  `creator` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  `creation_time` char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改人',
+  `modified_time` char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改时间',
+  `valid` tinyint(1) NOT NULL DEFAULT '1' COMMENT '合法标识',
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='对象类型交付配置表';
+
+CREATE TABLE IF NOT EXISTS `dt_define_info_collect` (
+  `id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `group_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '集团编码',
+  `project_id` varchar(40) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `define_info_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `code` varchar(40) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '信息点',
+  `class_code` varchar(40) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型编码',
+  `delivery_type` tinyint NOT NULL COMMENT '交付类型:0-项目交付 1-现场交付',
+  `is_delivery` tinyint DEFAULT '1' COMMENT '是否交付 0-否 1-是',
+  `key_word` tinyint DEFAULT '0' COMMENT '是否为关键信息点-台账详情使用',
+  `instance_scope` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '实例范围',
+  `data_source` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '交付数据来源',
+  `collect_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场收集信息',
+  `remark` text COLLATE utf8mb4_general_ci COMMENT '备注',
+  `creator` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  `creation_time` char(14) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改人',
+  `modified_time` char(14) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改时间',
+  `valid` tinyint DEFAULT '1' COMMENT '有效表示',
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='信息点交付配置表';
+
+CREATE TABLE IF NOT EXISTS "dt_define_relation_collect" (
+  "id" varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  "group_code" varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '集团编码',
+  "project_id" varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目ID',
+  "delivery_type" tinyint DEFAULT NULL COMMENT '交付类型:0-项目交付 1-现场交付',
+  "graph_code" varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图类型编码',
+  "rel_code" varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '边类型编码',
+  "source_type_codes" json DEFAULT NULL COMMENT '源端对象类型编码',
+  "end_type_codes" json DEFAULT NULL COMMENT '末端对象类型编码',
+  "automatic_flag" tinyint(1) DEFAULT NULL COMMENT '计算方式:0-手动计算 1-自动计算',
+  "pipe_use" text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '管道用途',
+  "remark" text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '备注',
+  "creator" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  "creation_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建时间',
+  "modifier" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改人',
+  "modified_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改时间',
+  "valid" tinyint DEFAULT '1' COMMENT '合法标识',
+  "ts" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '乐观锁',
+  PRIMARY KEY ("id") USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;

+ 14 - 5
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoCollect.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.define.entity;
+package com.persagy.dmp.delivery.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
@@ -27,10 +27,19 @@ public class ObjectInfoCollect extends AuditableEntity {
     private String code;
     /** 信息点类型 */
     private String classCode;
-    /** 是否可见 true -可见 false-不可见 */
-    private Boolean visiable;
-
-    /** 是否为关键信息点  */
+    /** 是否为关键信息点(台账详情使用)  */
     private Boolean keyWord;
+    /** 交付类型:0-项目交付 1-现场交付  */
+    private Integer deliveryType;
+    /** 是否交付 0-否 1-是 */
+    private Integer isDelivery;
+    /** 交付实例范围 */
+    private String instanceScope;
+    /** 交付数据来源 */
+    private String dataSource;
+    /** 现场收集信息 */
+    private String collectInfo;
+    /** 备注 */
+    private String remark;
 
 }

+ 41 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/delivery/entity/ObjectTypeCollect.java

@@ -0,0 +1,41 @@
+package com.persagy.dmp.delivery.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 平台/项目级采集的信息点定义
+ * @author linhuili
+ * @date 2021-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "dt_define_type_collect", autoResultMap = true)
+public class ObjectTypeCollect extends AuditableEntity {
+    /** 集团编码 */
+    private String groupCode;
+    /** 项目ID 0-平台级 1-项目级 */
+    private String projectId;
+    /** 关联类型ID */
+    @NotNull(message = "类型ID不能为空")
+    private String defineTypeId;
+    /** 类型编码编码 */
+    private String code;
+    /** 对象类型 */
+    private String objType;
+    /** 交付类型:0-项目交付 1-现场交付  */
+    private Integer deliveryType;
+    /** 是否交付 0-否 1-是 */
+    private Integer isDelivery;
+    /** 交付范围:实例范围 */
+    private String instanceScope;
+    /** 交付范围:依赖&关联 */
+    private String associationRelation;
+    /** 备注 */
+    private String remark;
+
+}

+ 46 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/delivery/entity/RelationDefineCollect.java

@@ -0,0 +1,46 @@
+package com.persagy.dmp.delivery.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 平台/项目级采集的信息点定义
+ * @author linhuili
+ * @date 2021-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "dt_define_relation_collect", autoResultMap = true)
+public class RelationDefineCollect extends AuditableEntity {
+    /** 集团编码 */
+    private String groupCode;
+    /** 项目ID 0-平台级 1-项目级 */
+    private String projectId;
+    /** 交付类型:0-项目交付 1-现场交付  */
+    private Integer deliveryType;
+    /** 源端对象类型编码 */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private ArrayNode sourceTypeCodes;
+    /** 末端对象类型编码 */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private ArrayNode endTypeCodes;
+    /** 图类型编码 */
+    private String graphCode;
+    /** 边类型编码  */
+    private String relCode;
+    /** 计算方式:0-手动计算 1-自动计算 */
+    private Integer automaticFlag;
+    /** 管道用途 */
+    private String pipeUse;
+    /** 备注 */
+    private String remark;
+
+}