Explorar o código

实现项目关系计算的相关接口

lijie %!s(int64=3) %!d(string=hai) anos
pai
achega
7894af0082
Modificáronse 28 ficheiros con 409 adicións e 309 borrados
  1. 7 7
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java
  2. 16 16
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java
  3. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/RelationCaclController.java
  4. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/RelationProjectCalController.java
  5. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/ObjectRelationMapper.java
  6. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/RelationCalSignMapper.java
  7. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/RelationProjectCalMapper.java
  8. 0 86
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/domain/RelationProjectCal.java
  9. 8 8
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectRelationService.java
  10. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/RelationCaclService.java
  11. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/RelationCalSignService.java
  12. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/RelationProjectCalService.java
  13. 10 10
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectRelationServiceImpl.java
  14. 28 27
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCaclServiceImpl.java
  15. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCalSignServiceImpl.java
  16. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationProjectCalServiceImpl.java
  17. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/utils/ObjectDigitalCriteriaHelper.java
  18. 1 1
      dmp-business/dmp-rwd/src/main/resources/mapper/ObjectRelationMapper.xml
  19. 1 1
      dmp-business/dmp-rwd/src/main/resources/mapper/RelationCalSignMapper.xml
  20. 0 24
      dmp-business/dmp-rwd/src/main/resources/mapper/RelationProjectCalMapper.xml
  21. 11 11
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationCaclClient.java
  22. 9 9
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationCaclFacade.java
  23. 26 26
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationClient.java
  24. 16 16
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationFacade.java
  25. 132 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationProjectCalClient.java
  26. 56 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/ObjectRelation.java
  27. 1 6
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/domain/RelationCalSign.java
  28. 69 43
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/RelationProjectCal.java

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

@@ -25,7 +25,7 @@ import com.persagy.dmp.common.utils.JsonHelper;
 import com.persagy.dmp.common.utils.ParamCheckUtil;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.digital.entity.ObjectDigital;
-import com.persagy.dmp.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
@@ -303,17 +303,17 @@ public class ObjectDigitalController{
         if (StrUtil.isNotBlank(requestData.getFloorId())){
             // criteria条件
             ObjectNode criteriaObj = objectMapper.createObjectNode();
-            criteriaObj.put(RelationProjectCal.REL_CODE_HUM, DigitalRelCode.EQ_2_FL.getIndex());
-            criteriaObj.put(RelationProjectCal.OBJ_TO_HUM, requestData.getFloorId());
-            objectNode.put(RelationProjectCal.RELATION_FROM_HUM,criteriaObj);
+            criteriaObj.put(ObjectRelation.REL_CODE_HUM, DigitalRelCode.EQ_2_FL.getIndex());
+            criteriaObj.put(ObjectRelation.OBJ_TO_HUM, requestData.getFloorId());
+            objectNode.put(ObjectRelation.RELATION_FROM_HUM,criteriaObj);
         }
         // 系统id
         if (StrUtil.isNotBlank(requestData.getSystemId())){
             // criteria条件
             ObjectNode criteriaObj = objectMapper.createObjectNode();
-            criteriaObj.put(RelationProjectCal.REL_CODE_HUM, DigitalRelCode.SY_2_EQ.getIndex());
-            criteriaObj.put(RelationProjectCal.OBJ_FROM_HUM, requestData.getFloorId());
-            objectNode.put(RelationProjectCal.RELATION_TO_HUM,criteriaObj);
+            criteriaObj.put(ObjectRelation.REL_CODE_HUM, DigitalRelCode.SY_2_EQ.getIndex());
+            criteriaObj.put(ObjectRelation.OBJ_FROM_HUM, requestData.getFloorId());
+            objectNode.put(ObjectRelation.RELATION_TO_HUM,criteriaObj);
         }
         // installLocation安装位置
         if (StrUtil.isNotBlank(requestData.getInstallLocation())){

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

@@ -12,7 +12,7 @@ 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.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
@@ -39,18 +39,18 @@ public class ObjectRelationController {
     private IObjectRelationService service;
 
     @PostMapping("query")
-    public CommonResult<List<RelationProjectCal>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<ObjectRelation>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
 
-        QueryWrapper<RelationProjectCal> wrapper = new QueryWrapper<>();
+        QueryWrapper<ObjectRelation> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
         ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         // 转换查询条件
-        QueryCriteriaHelper.toWrapper(wrapper, criteria, RelationProjectCal.class);
+        QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectRelation.class);
         Page page = QueryCriteriaHelper.toPage(criteria);
         if(criteria.isOnlyCount()) {
             Integer total = service.queryCount(wrapper);
@@ -62,10 +62,10 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/createOne")
-    public CommonResult<RelationProjectCal> create(@Valid @RequestBody RelationProjectCal vo){
+    public CommonResult<ObjectRelation> create(@Valid @RequestBody ObjectRelation vo){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-        List<RelationProjectCal> voList = CollUtil.newArrayList(vo);
+        List<ObjectRelation> voList = CollUtil.newArrayList(vo);
         //创建默认条件
         createDefaultValue(voList);
         //新增对象关系
@@ -74,7 +74,7 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/create")
-    public CommonResult<List<RelationProjectCal>> createBatch(@Valid @RequestBody List<RelationProjectCal> voList){
+    public CommonResult<List<ObjectRelation>> createBatch(@Valid @RequestBody List<ObjectRelation> voList){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
         //创建默认条件
@@ -85,10 +85,10 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/updateOne")
-    public CommonResult<RelationProjectCal> update(@Valid @RequestBody RelationProjectCal vo){
+    public CommonResult<ObjectRelation> update(@Valid @RequestBody ObjectRelation vo){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-        List<RelationProjectCal> voList = CollUtil.newArrayList(vo);
+        List<ObjectRelation> voList = CollUtil.newArrayList(vo);
         //修改默认条件
         createDefaultValue(voList);
         //修改对象关系
@@ -97,7 +97,7 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/update")
-    public CommonResult<List<RelationProjectCal>> updateBatch(@Valid @RequestBody List<RelationProjectCal> voList){
+    public CommonResult<List<ObjectRelation>> updateBatch(@Valid @RequestBody List<ObjectRelation> voList){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
         //修改默认条件
@@ -119,16 +119,16 @@ public class ObjectRelationController {
      * @return
      */
     @PostMapping("/delete")
-    public CommonResult<List<RelationProjectCal>> deleteBatch(@RequestBody QueryCriteria criteria){
+    public CommonResult<List<ObjectRelation>> deleteBatch(@RequestBody QueryCriteria criteria){
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
-        QueryWrapper<RelationProjectCal> wrapper = new QueryWrapper<>();
+        QueryWrapper<ObjectRelation> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
         ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         // 转换查询条件
-        QueryCriteriaHelper.toWrapper(wrapper, criteria, RelationProjectCal.class);
-        List<RelationProjectCal> delList = service.delete(wrapper);
+        QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectRelation.class);
+        List<ObjectRelation> delList = service.delete(wrapper);
         return ResultHelper.multi(delList,delList.size());
     }
 
@@ -136,7 +136,7 @@ public class ObjectRelationController {
      * 创建默认条件
      * @param voList
      */
-    private void createDefaultValue(List<RelationProjectCal> voList){
+    private void createDefaultValue(List<ObjectRelation> voList){
         String groupCode = AppContext.getContext().getGroupCode();
         if(StringUtils.isEmpty(groupCode)){
             //默认集团
@@ -147,7 +147,7 @@ public class ObjectRelationController {
             //默认项目
             projectId = CommonConstant.DEFAULT_ID;
         }
-        for (RelationProjectCal vo : voList) {
+        for (ObjectRelation vo : voList) {
             vo.setGroupCode(groupCode);
             vo.setProjectId(projectId);
             if(vo.getValid() == null) {

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

@@ -7,7 +7,7 @@ import com.persagy.dmp.basic.dto.RequestData;
 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.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.service.RelationCaclService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -40,7 +40,7 @@ public class RelationCaclController {
      * Update By lijie 2021/9/2 20:20
      */
     @PostMapping("createObjRelationsByKeywordAndObjType")
-    public CommonResult<List<RelationProjectCal>> createObjRelationsByKeywordAndObjType(@RequestBody RequestData requestData){
+    public CommonResult<List<ObjectRelation>> createObjRelationsByKeywordAndObjType(@RequestBody RequestData requestData){
         // 校验必填项
         if (StrUtil.isBlank(requestData.getGraphCode())
                 || StrUtil.isBlank(requestData.getRelCode())
@@ -65,7 +65,7 @@ public class RelationCaclController {
      * Update By lijie 2021/9/2 20:20
      */
     @PostMapping("deleteObjRelationsByRelId")
-    public CommonResult<List<RelationProjectCal>> deleteObjRelationsByRelId(@Validated @RequestBody RelationProjectCal objectRelation){
+    public CommonResult<List<ObjectRelation>> deleteObjRelationsByRelId(@Validated @RequestBody ObjectRelation objectRelation){
         return relationCaclService.deleteObjRelationsByRelId(objectRelation);
     }
 

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/RelationProjectCalController.java

@@ -13,8 +13,8 @@ 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.digital.entity.RelationProjectCal;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
-import com.persagy.dmp.rwd.digital.domain.RelationProjectCal;
 import com.persagy.dmp.rwd.digital.service.RelationProjectCalService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -33,7 +33,7 @@ import java.util.List;
  * Update By lijie 2021/9/2 21:19
  */
 @RestController
-@RequestMapping("/rwd/instance/object/compatible/")
+@RequestMapping("/rwd/instance/relation/project/cal/")
 @RequiredArgsConstructor
 public class RelationProjectCalController {
 

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

@@ -2,7 +2,7 @@ package com.persagy.dmp.rwd.digital.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.dmp.digital.entity.ObjectDigital;
-import com.persagy.dmp.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.Set;
  * @author Charlie Yu
  * @date 2021-07-08
  */
-public interface ObjectRelationMapper extends BaseMapper<RelationProjectCal> {
+public interface ObjectRelationMapper extends BaseMapper<ObjectRelation> {
     /***
      * Description: 根据对象id查询关系
      * @param objIds : 对象id

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/RelationCalSignMapper.java

@@ -1,7 +1,7 @@
 package com.persagy.dmp.rwd.digital.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dmp.rwd.digital.domain.RelationCalSign;
+import com.persagy.dmp.digital.entity.RelationCalSign;
 
 /**
  * @Entity generator.domain.RelationCalSign

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/RelationProjectCalMapper.java

@@ -1,7 +1,7 @@
 package com.persagy.dmp.rwd.digital.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dmp.rwd.digital.domain.RelationProjectCal;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 
 /**
  * @Entity generator.domain.RelationProjectCal

+ 0 - 86
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/domain/RelationProjectCal.java

@@ -1,86 +0,0 @@
-package com.persagy.dmp.rwd.digital.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.dmp.common.model.entity.AuditableEntity;
-import lombok.*;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 
- * @TableName relation_project_cal
- */
-@TableName(value ="relation_project_cal")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class RelationProjectCal extends AuditableEntity {
-
-    /**
-     * 图类型
-     */
-    @TableField(value = "graph_code")
-    private String graphCode;
-
-    /**
-     * 关系类型编码
-     */
-    @TableField(value = "rel_code")
-    private String relCode;
-
-    /**
-     * 是否需要配置源末端
-     */
-    @TableField(value = "source_flag")
-    private Byte sourceFlag;
-
-    /**
-     * 是否自动计算类型
-     */
-    @TableField(value = "automatic_flag")
-    private Byte automaticFlag;
-
-    /**
-     * 手动计算类型 1 禁用  2提示引导 3手动维护
-     */
-    @TableField(value = "manual")
-    private Integer manual;
-
-    /**
-     * 项目id
-     */
-    @TableField(value = "project_id")
-    private String projectId;
-
-    /**
-     * 最后一次自动计算时间
-     */
-    @TableField(value = "computing_time")
-    private String computingTime;
-
-    /**
-     * 计算状态 1初始状态 2需要计算 3计算中 4等待中 5计算失败(如果处于计算中状态,则不再次调用)
-     */
-    @TableField(value = "computational_state")
-    private Byte computationalState;
-
-    /**
-     * 业务分区类型
-     */
-    @TableField(value = "zone_type")
-    private String zoneType;
-
-    /**
-     * 计算版本
-     */
-    @TableField(value = "compute_version")
-    private Byte computeVersion;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-}

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

@@ -4,7 +4,7 @@ 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.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import java.util.List;
 
 /**
@@ -12,21 +12,21 @@ import java.util.List;
  * @author Charlie Yu
  * @date 2021-07-08
  */
-public interface IObjectRelationService extends IService<RelationProjectCal> {
+public interface IObjectRelationService extends IService<ObjectRelation> {
 
     /**
      * 按条件查询
      * @param queryWrapper 查询条件
      * @return 列表
      */
-    List<RelationProjectCal> queryByCondition(Wrapper<RelationProjectCal> queryWrapper);
+    List<ObjectRelation> queryByCondition(Wrapper<ObjectRelation> queryWrapper);
 
     /**
      * 按条件计数
      * @param queryWrapper 查询条件
      * @return 结果数量
      */
-    Integer queryCount(Wrapper<RelationProjectCal> queryWrapper);
+    Integer queryCount(Wrapper<ObjectRelation> queryWrapper);
 
     /**
      * 按条件查询
@@ -34,25 +34,25 @@ public interface IObjectRelationService extends IService<RelationProjectCal> {
      * @param queryWrapper 查询条件
      * @return 分页结果
      */
-    Page queryByCondition(Page page, Wrapper<RelationProjectCal> queryWrapper);
+    Page queryByCondition(Page page, Wrapper<ObjectRelation> queryWrapper);
 
     /**
      * 新增
      * @param voList 待新增数据
      * @return 新增后数据
      */
-    List<RelationProjectCal> insert(List<RelationProjectCal> voList);
+    List<ObjectRelation> insert(List<ObjectRelation> voList);
 
     /**
      * 修改
      * @param voList 待修改数据
      * @return 修改后数据
      */
-    List<RelationProjectCal> update(List<RelationProjectCal> voList);
+    List<ObjectRelation> update(List<ObjectRelation> voList);
 
     /**
      * 删除
      * @param wrapper 删除条件
      */
-    List<RelationProjectCal> delete(QueryWrapper wrapper);
+    List<ObjectRelation> delete(QueryWrapper wrapper);
 }

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/RelationCaclService.java

@@ -2,7 +2,7 @@ package com.persagy.dmp.rwd.digital.service;
 
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.model.response.CommonResult;
-import com.persagy.dmp.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 
 import java.util.List;
 
@@ -21,7 +21,7 @@ public interface RelationCaclService {
      * @date :2021/9/2 21:24
      * Update By lijie 2021/9/2 21:24
      */
-    CommonResult<List<RelationProjectCal>> createObjRelationsByKeywordAndObjType(RequestData requestData);
+    CommonResult<List<ObjectRelation>> createObjRelationsByKeywordAndObjType(RequestData requestData);
     /***
      * Description: 根据fromId,toId,relType,graphCode删除关系
      * @param objectRelation : 请求参数
@@ -30,5 +30,5 @@ public interface RelationCaclService {
      * @date :2021/9/2 20:20
      * Update By lijie 2021/9/2 20:20
      */
-    CommonResult<List<RelationProjectCal>> deleteObjRelationsByRelId(RelationProjectCal objectRelation);
+    CommonResult<List<ObjectRelation>> deleteObjRelationsByRelId(ObjectRelation objectRelation);
 }

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

@@ -1,7 +1,7 @@
 package com.persagy.dmp.rwd.digital.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.persagy.dmp.rwd.digital.domain.RelationCalSign;
+import com.persagy.dmp.digital.entity.RelationCalSign;
 
 /**
  *

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

@@ -1,7 +1,7 @@
 package com.persagy.dmp.rwd.digital.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.persagy.dmp.rwd.digital.domain.RelationProjectCal;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 
 /**
  *

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

@@ -5,7 +5,7 @@ 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.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
 import com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
@@ -24,7 +24,7 @@ import java.util.List;
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper, RelationProjectCal> implements IObjectRelationService  {
+public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper, ObjectRelation> implements IObjectRelationService  {
 
     @Resource
     private ObjectRelationMapper dao;
@@ -41,17 +41,17 @@ public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper,
      * @return
      */
     @Override
-    public List<RelationProjectCal> queryByCondition(Wrapper<RelationProjectCal> queryWrapper) {
+    public List<ObjectRelation> queryByCondition(Wrapper<ObjectRelation> queryWrapper) {
         return dao.selectList(queryWrapper);
     }
 
     @Override
-    public Integer queryCount(Wrapper<RelationProjectCal> queryWrapper) {
+    public Integer queryCount(Wrapper<ObjectRelation> queryWrapper) {
         return dao.selectCount(queryWrapper);
     }
 
     @Override
-    public Page queryByCondition(Page page, Wrapper<RelationProjectCal> queryWrapper) {
+    public Page queryByCondition(Page page, Wrapper<ObjectRelation> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
     }
 
@@ -61,7 +61,7 @@ public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper,
      * @return
      */
     @Override
-    public List<RelationProjectCal> insert(List<RelationProjectCal> voList) {
+    public List<ObjectRelation> insert(List<ObjectRelation> voList) {
         iService.saveOrUpdateBatch(voList);
         return voList;
     }
@@ -73,7 +73,7 @@ public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper,
      * @return
      */
     @Override
-    public List<RelationProjectCal> update(List<RelationProjectCal> voList) {
+    public List<ObjectRelation> update(List<ObjectRelation> voList) {
         iService.saveOrUpdateBatch(voList);
         return voList;
     }
@@ -84,15 +84,15 @@ public class ObjectRelationServiceImpl extends ServiceImpl<ObjectRelationMapper,
      * @return
      */
     @Override
-    public List<RelationProjectCal> delete(QueryWrapper wrapper) {
+    public List<ObjectRelation> delete(QueryWrapper wrapper) {
         //根据条件查询有效关系数据
         wrapper.eq("valid",ValidEnum.TRUE.getType());
-        List<RelationProjectCal> list = dao.selectList(wrapper);
+        List<ObjectRelation> list = dao.selectList(wrapper);
         if(list == null || list.size()<=0){
             return new ArrayList<>();
         }
         //批量删除关系数据
-        for (RelationProjectCal relation : list) {
+        for (ObjectRelation relation : list) {
             relation.setValid(ValidEnum.FALSE.getType());
         }
         iService.saveOrUpdateBatch(list);

+ 28 - 27
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCaclServiceImpl.java

@@ -15,10 +15,11 @@ import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationCalSign;
 import com.persagy.dmp.digital.entity.RelationProjectCal;
 import com.persagy.dmp.rwd.basic.constant.BusinessErrorRwdCode;
 import com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
-import com.persagy.dmp.rwd.digital.domain.RelationCalSign;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import com.persagy.dmp.rwd.digital.service.RelationCaclService;
 import com.persagy.dmp.rwd.digital.service.RelationCalSignService;
@@ -53,7 +54,7 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      */
     @Override
     @Transactional
-    public CommonResult<List<RelationProjectCal>> createObjRelationsByKeywordAndObjType(@RequestBody RequestData requestData) {
+    public CommonResult<List<ObjectRelation>> createObjRelationsByKeywordAndObjType(@RequestBody RequestData requestData) {
         // 0.更新计算时间,根据项目id和图类型编码及关系类型编码
         updateComputeTimeByProjectAndGraphCodeAndRelCode(requestData.getGraphCode(),requestData.getRelCode());
         // 根据对象信息点和对象内容(主/副)查询对象,然后添加关系及计算标记
@@ -88,12 +89,12 @@ public class RelationCaclServiceImpl implements RelationCaclService {
                 .filter(objectDigital -> !objectDigital.getMainFlag())
                 .collect(Collectors.toList());
         // 4.3 根据主对象id和从对象id数组查询已经存在的关系
-        Map<String, RelationProjectCal> relationMap =
+        Map<String, ObjectRelation> relationMap =
                 queryObjectRelationMapByFromIdAndToIds(masterObjectDigital.getId(),slaveObjectDigitals
                 .stream().map(BaseEntity::getId).collect(Collectors.toList()));
         // 4.3 创建关系
-        List<RelationProjectCal> addRelations = new ArrayList<>();
-        List<RelationProjectCal> updateRelations = new ArrayList<>();
+        List<ObjectRelation> addRelations = new ArrayList<>();
+        List<ObjectRelation> updateRelations = new ArrayList<>();
         List<RelationCalSign> relationCalSigns = new ArrayList<>();
         boolean flag = StrUtil.isNotBlank(requestData.getSign()) && NumberUtil.isInteger(requestData.getSign());
         for (ObjectDigital slaveObjectDigital : slaveObjectDigitals) {
@@ -105,7 +106,7 @@ public class RelationCaclServiceImpl implements RelationCaclService {
                             masterObjectDigital.getId(),
                             slaveObjectDigital.getId());
             if (relationMap.containsKey(uniqueKey)){
-                RelationProjectCal objectRelation = relationMap.get(uniqueKey);
+                ObjectRelation objectRelation = relationMap.get(uniqueKey);
                 objectRelation.setUpdateApp(AppContext.getContext().getAppId());
                 objectRelation.setModifier(AppContext.getContext().getAccountId());
                 if (requestData.getHasRelValue()){
@@ -124,7 +125,7 @@ public class RelationCaclServiceImpl implements RelationCaclService {
                 continue;
             }
             // 生成插入关系
-            RelationProjectCal objectRelation = new RelationProjectCal();
+            ObjectRelation objectRelation = new ObjectRelation();
             objectRelation.setId(IdWorker.getIdStr());
             objectRelation.setGraphCode(requestData.getGraphCode());
             objectRelation.setGroupCode(AppContext.getContext().getGroupCode());
@@ -175,22 +176,22 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      */
     @Override
     @Transactional
-    public CommonResult<List<RelationProjectCal>> deleteObjRelationsByRelId(RelationProjectCal objectRelation) {
+    public CommonResult<List<ObjectRelation>> deleteObjRelationsByRelId(ObjectRelation objectRelation) {
         // 1.先查询关系
-        LambdaQueryWrapper<RelationProjectCal> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(RelationProjectCal::getGraphCode,objectRelation.getGraphCode());
-        queryWrapper.eq(RelationProjectCal::getRelCode,objectRelation.getRelCode());
-        queryWrapper.eq(RelationProjectCal::getObjFrom,objectRelation.getObjFrom());
-        queryWrapper.eq(RelationProjectCal::getObjTo,objectRelation.getObjTo());
-        queryWrapper.eq(RelationProjectCal::getValid,true);
-        List<RelationProjectCal> objectRelations = objectRelationService.list(queryWrapper);
+        LambdaQueryWrapper<ObjectRelation> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ObjectRelation::getGraphCode,objectRelation.getGraphCode());
+        queryWrapper.eq(ObjectRelation::getRelCode,objectRelation.getRelCode());
+        queryWrapper.eq(ObjectRelation::getObjFrom,objectRelation.getObjFrom());
+        queryWrapper.eq(ObjectRelation::getObjTo,objectRelation.getObjTo());
+        queryWrapper.eq(ObjectRelation::getValid,true);
+        List<ObjectRelation> objectRelations = objectRelationService.list(queryWrapper);
         if (CollUtil.isEmpty(objectRelations)){
             throw new BusinessException(BusinessErrorRwdCode.A7201.getCode(),BusinessErrorRwdCode.A7201.getDesc());
         }
         // 2.先更新计算时间
         updateComputeTimeByProjectAndGraphCodeAndRelCode(objectRelation.getGraphCode(),objectRelation.getRelCode());
         // 3.删除关系
-        for (RelationProjectCal relation : objectRelations) {
+        for (ObjectRelation relation : objectRelations) {
             relation.setValid(0);
             relation.setModifier(AppContext.getContext().getAccountId());
             relation.setUpdateApp(AppContext.getContext().getAppId());
@@ -209,11 +210,11 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      * Update By lijie 2021/9/4 23:14
      */
     private void updateComputeTimeByProjectAndGraphCodeAndRelCode(String graphCode,String relCode) {
-        LambdaUpdateWrapper<com.persagy.dmp.rwd.digital.domain.RelationProjectCal> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(com.persagy.dmp.rwd.digital.domain.RelationProjectCal::getProjectId,AppContext.getContext().getProjectId());
-        updateWrapper.eq(com.persagy.dmp.rwd.digital.domain.RelationProjectCal::getGraphCode,graphCode);
-        updateWrapper.eq(com.persagy.dmp.rwd.digital.domain.RelationProjectCal::getRelCode,relCode);
-        com.persagy.dmp.rwd.digital.domain.RelationProjectCal relationProjectCal = new com.persagy.dmp.rwd.digital.domain.RelationProjectCal();
+        LambdaUpdateWrapper<RelationProjectCal> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(RelationProjectCal::getProjectId,AppContext.getContext().getProjectId());
+        updateWrapper.eq(RelationProjectCal::getGraphCode,graphCode);
+        updateWrapper.eq(RelationProjectCal::getRelCode,relCode);
+        RelationProjectCal relationProjectCal = new RelationProjectCal();
         relationProjectCal.setComputingTime(DateUtil.format(new Date(),"yyyyMMddHHmmss"));
         relationProjectCalService.update(relationProjectCal,updateWrapper);
     }
@@ -228,15 +229,15 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      * @date :2021/9/3 16:29
      * Update By lijie 2021/9/3 16:29
      */
-    private Map<String, RelationProjectCal> queryObjectRelationMapByFromIdAndToIds(String fromId, List<String> toIds) {
+    private Map<String, ObjectRelation> queryObjectRelationMapByFromIdAndToIds(String fromId, List<String> toIds) {
         if (StrUtil.isBlank(fromId) || CollUtil.isEmpty(toIds)){
             return new HashMap<>();
         }
-        LambdaQueryWrapper<RelationProjectCal> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(RelationProjectCal::getObjTo,toIds);
-        queryWrapper.eq(RelationProjectCal::getObjFrom,fromId);
-        queryWrapper.eq(RelationProjectCal::getValid,true);
-        List<RelationProjectCal> objectRelations = objectRelationService.list(queryWrapper);
+        LambdaQueryWrapper<ObjectRelation> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(ObjectRelation::getObjTo,toIds);
+        queryWrapper.eq(ObjectRelation::getObjFrom,fromId);
+        queryWrapper.eq(ObjectRelation::getValid,true);
+        List<ObjectRelation> objectRelations = objectRelationService.list(queryWrapper);
         if (CollUtil.isEmpty(objectRelations)){
             return new HashMap<>();
         }

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCalSignServiceImpl.java

@@ -1,8 +1,8 @@
 package com.persagy.dmp.rwd.digital.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.persagy.dmp.digital.entity.RelationCalSign;
 import com.persagy.dmp.rwd.digital.dao.RelationCalSignMapper;
-import com.persagy.dmp.rwd.digital.domain.RelationCalSign;
 import com.persagy.dmp.rwd.digital.service.RelationCalSignService;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationProjectCalServiceImpl.java

@@ -1,8 +1,8 @@
 package com.persagy.dmp.rwd.digital.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 import com.persagy.dmp.rwd.digital.dao.RelationProjectCalMapper;
-import com.persagy.dmp.rwd.digital.domain.RelationProjectCal;
 import com.persagy.dmp.rwd.digital.service.RelationProjectCalService;
 import org.springframework.stereotype.Service;
 

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/utils/ObjectDigitalCriteriaHelper.java

@@ -14,7 +14,7 @@ import com.persagy.dmp.basic.model.QueryOperator;
 import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.digital.entity.ObjectDigital;
-import com.persagy.dmp.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 
 import java.util.*;
 
@@ -252,7 +252,7 @@ public class ObjectDigitalCriteriaHelper {
      */
     private static void ensureRelationIds(ObjectNode criteria, boolean isFrom) {
         String flagKey = isFrom ? QueryOperator.RELATION_FROM.getIndex() : QueryOperator.RELATION_TO.getIndex();
-        String selectKey = isFrom ? RelationProjectCal.OBJ_FROM : RelationProjectCal.OBJ_TO;
+        String selectKey = isFrom ? ObjectRelation.OBJ_FROM : ObjectRelation.OBJ_TO;
         String whereKey = isFrom ? "objTo" : "objFrom";
         JsonNode relationCond = criteria.get(flagKey);
         // 没有条件不需要处理

+ 1 - 1
dmp-business/dmp-rwd/src/main/resources/mapper/ObjectRelationMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper">
 
-    <resultMap id="BaseResultMap" type="com.persagy.dmp.digital.entity.RelationProjectCal">
+    <resultMap id="BaseResultMap" type="com.persagy.dmp.digital.entity.ObjectRelation">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="groupCode" column="group_code" jdbcType="VARCHAR"/>
             <result property="projectId" column="project_id" jdbcType="VARCHAR"/>

+ 1 - 1
dmp-business/dmp-rwd/src/main/resources/mapper/RelationCalSignMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.persagy.dmp.rwd.digital.dao.RelationCalSignMapper">
 
-    <resultMap id="BaseResultMap" type="com.persagy.dmp.rwd.digital.domain.RelationCalSign">
+    <resultMap id="BaseResultMap" type="com.persagy.dmp.digital.entity.RelationCalSign">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="sign" column="sign" jdbcType="TINYINT"/>
             <result property="creationTime" column="creation_time" jdbcType="CHAR"/>

+ 0 - 24
dmp-business/dmp-rwd/src/main/resources/mapper/RelationProjectCalMapper.xml

@@ -3,28 +3,4 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.persagy.dmp.rwd.digital.dao.RelationProjectCalMapper">
-
-    <resultMap id="BaseResultMap" type="com.persagy.dmp.rwd.digital.domain.RelationProjectCal">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="graphCode" column="graph_code" jdbcType="VARCHAR"/>
-            <result property="relCode" column="rel_code" jdbcType="VARCHAR"/>
-            <result property="sourceFlag" column="source_flag" jdbcType="TINYINT"/>
-            <result property="automaticFlag" column="automatic_flag" jdbcType="TINYINT"/>
-            <result property="manual" column="manual" jdbcType="INTEGER"/>
-            <result property="lastUpdate" column="last_update" jdbcType="TIMESTAMP"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
-            <result property="computingTime" column="computing_time" jdbcType="VARCHAR"/>
-            <result property="computationalState" column="computational_state" jdbcType="TINYINT"/>
-            <result property="zoneType" column="zone_type" jdbcType="VARCHAR"/>
-            <result property="computeVersion" column="compute_version" jdbcType="TINYINT"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,graph_code,rel_code,
-        source_flag,automatic_flag,manual,
-        last_update,create_time,project_id,
-        computing_time,computational_state,zone_type,
-        compute_version
-    </sql>
 </mapper>

+ 11 - 11
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationCaclClient.java

@@ -3,7 +3,7 @@ package com.persagy.dmp.digital.client;
 import com.persagy.dmp.basic.config.DigitalFeignConfig;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.model.response.CommonResult;
-import com.persagy.dmp.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,11 +31,11 @@ public interface DigitalRelationCaclClient {
      * @return
      */
     @PostMapping("createObjRelationsByKeywordAndObjType")
-    CommonResult<List<RelationProjectCal>> createObjRelationsByKeywordAndObjType(@RequestParam("groupCode") String groupCode,
-                                                                                 @RequestParam("projectId") String projectId,
-                                                                                 @RequestParam("appId") String appId,
-                                                                                 @RequestParam("userId") String userId,
-                                                                                 @RequestBody RequestData requestData);
+    CommonResult<List<ObjectRelation>> createObjRelationsByKeywordAndObjType(@RequestParam("groupCode") String groupCode,
+                                                                             @RequestParam("projectId") String projectId,
+                                                                             @RequestParam("appId") String appId,
+                                                                             @RequestParam("userId") String userId,
+                                                                             @RequestBody RequestData requestData);
     /**
      * 根据项目ID查询设备数量和待报废设备数量统计
      * @param groupCode: 集团编码
@@ -46,9 +46,9 @@ public interface DigitalRelationCaclClient {
      * @return
      */
     @PostMapping("deleteObjRelationsByRelId")
-    CommonResult<List<RelationProjectCal>> deleteObjRelationsByRelId(@RequestParam("groupCode") String groupCode,
-                                                                     @RequestParam("projectId") String projectId,
-                                                                     @RequestParam("appId") String appId,
-                                                                     @RequestParam("userId") String userId,
-                                                                     @RequestBody RelationProjectCal objectRelation);
+    CommonResult<List<ObjectRelation>> deleteObjRelationsByRelId(@RequestParam("groupCode") String groupCode,
+                                                                 @RequestParam("projectId") String projectId,
+                                                                 @RequestParam("appId") String appId,
+                                                                 @RequestParam("userId") String userId,
+                                                                 @RequestBody ObjectRelation objectRelation);
 }

+ 9 - 9
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationCaclFacade.java

@@ -3,7 +3,7 @@ package com.persagy.dmp.digital.client;
 import cn.hutool.extra.spring.SpringUtil;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.model.response.CommonResult;
-import com.persagy.dmp.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
@@ -28,10 +28,10 @@ public class DigitalRelationCaclFacade {
      * @return
      */
     @PostMapping("createObjRelationsByKeywordAndObjType")
-    public List<RelationProjectCal> createObjRelationsByKeywordAndObjType(String groupCode, String projectId,
-                                                                          String appId, String userId,
-                                                                          RequestData requestData){
-        CommonResult<List<RelationProjectCal>> relations =
+    public List<ObjectRelation> createObjRelationsByKeywordAndObjType(String groupCode, String projectId,
+                                                                      String appId, String userId,
+                                                                      RequestData requestData){
+        CommonResult<List<ObjectRelation>> relations =
                 client.createObjRelationsByKeywordAndObjType(groupCode, projectId, appId, userId, requestData);
         return relations.getData();
     }
@@ -45,10 +45,10 @@ public class DigitalRelationCaclFacade {
      * @return
      */
     @PostMapping("deleteObjRelationsByRelId")
-    public List<RelationProjectCal> deleteObjRelationsByRelId(String groupCode, String projectId,
-                                                              String appId, String userId,
-                                                              RelationProjectCal objectRelation){
-        CommonResult<List<RelationProjectCal>> relations =
+    public List<ObjectRelation> deleteObjRelationsByRelId(String groupCode, String projectId,
+                                                          String appId, String userId,
+                                                          ObjectRelation objectRelation){
+        CommonResult<List<ObjectRelation>> relations =
                 client.deleteObjRelationsByRelId(groupCode, projectId, appId, userId, objectRelation);
         return relations.getData();
     }

+ 26 - 26
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationClient.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 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.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -32,11 +32,11 @@ public interface DigitalRelationClient {
      * @return 对象关系数组
      */
     @PostMapping("query")
-    CommonResult<List<RelationProjectCal>> query(@RequestParam("groupCode") String groupCode,
-                                                 @RequestParam("projectId") String projectId,
-                                                 @RequestParam("appId") String appId,
-                                                 @RequestParam("userId") String userId,
-                                                 @RequestBody QueryCriteria criteria);
+    CommonResult<List<ObjectRelation>> query(@RequestParam("groupCode") String groupCode,
+                                             @RequestParam("projectId") String projectId,
+                                             @RequestParam("appId") String appId,
+                                             @RequestParam("userId") String userId,
+                                             @RequestBody QueryCriteria criteria);
     /**
      * 新增物理世界对象关系-单个新增
      * @param groupCode: 集团编码
@@ -47,11 +47,11 @@ public interface DigitalRelationClient {
      * @return 对象关系
      */
     @PostMapping("createOne")
-    CommonResult<RelationProjectCal> createOne(@RequestParam("groupCode") String groupCode,
-                                               @RequestParam("projectId") String projectId,
-                                               @RequestParam("appId") String appId,
-                                               @RequestParam("userId") String userId,
-                                               @RequestBody ObjectNode node);
+    CommonResult<ObjectRelation> createOne(@RequestParam("groupCode") String groupCode,
+                                           @RequestParam("projectId") String projectId,
+                                           @RequestParam("appId") String appId,
+                                           @RequestParam("userId") String userId,
+                                           @RequestBody ObjectNode node);
     /**
      * 新增物理世界对象关系-批量新增
      * @param groupCode: 集团编码
@@ -62,11 +62,11 @@ public interface DigitalRelationClient {
      * @return 对象关系数组
      */
     @PostMapping("create")
-    CommonResult<List<RelationProjectCal>> create(@RequestParam("groupCode") String groupCode,
-                                                  @RequestParam("projectId") String projectId,
-                                                  @RequestParam("appId") String appId,
-                                                  @RequestParam("userId") String userId,
-                                                  @RequestBody List<ObjectNode> nodes);
+    CommonResult<List<ObjectRelation>> create(@RequestParam("groupCode") String groupCode,
+                                              @RequestParam("projectId") String projectId,
+                                              @RequestParam("appId") String appId,
+                                              @RequestParam("userId") String userId,
+                                              @RequestBody List<ObjectNode> nodes);
     /**
      * 更新物理世界对象关系-单个更新
      * @param groupCode: 集团编码
@@ -77,11 +77,11 @@ public interface DigitalRelationClient {
      * @return 对象关系
      */
     @PostMapping("updateOne")
-    CommonResult<RelationProjectCal> updateOne(@RequestParam("groupCode") String groupCode,
-                                               @RequestParam("projectId") String projectId,
-                                               @RequestParam("appId") String appId,
-                                               @RequestParam("userId") String userId,
-                                               @RequestBody ObjectNode node);
+    CommonResult<ObjectRelation> updateOne(@RequestParam("groupCode") String groupCode,
+                                           @RequestParam("projectId") String projectId,
+                                           @RequestParam("appId") String appId,
+                                           @RequestParam("userId") String userId,
+                                           @RequestBody ObjectNode node);
     /**
      * 更新物理世界对象关系-批量更新
      * @param groupCode: 集团编码
@@ -92,11 +92,11 @@ public interface DigitalRelationClient {
      * @return 对象关系数组
      */
     @PostMapping("update")
-    CommonResult<List<RelationProjectCal>> update(@RequestParam("groupCode") String groupCode,
-                                                  @RequestParam("projectId") String projectId,
-                                                  @RequestParam("appId") String appId,
-                                                  @RequestParam("userId") String userId,
-                                                  @RequestBody List<ObjectNode> nodes);
+    CommonResult<List<ObjectRelation>> update(@RequestParam("groupCode") String groupCode,
+                                              @RequestParam("projectId") String projectId,
+                                              @RequestParam("appId") String appId,
+                                              @RequestParam("userId") String userId,
+                                              @RequestBody List<ObjectNode> nodes);
     /**
      * 删除物理世界对象关系-单个删除
      * @param groupCode: 集团编码

+ 16 - 16
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationFacade.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
-import com.persagy.dmp.digital.entity.RelationProjectCal;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 
 import java.util.List;
 
@@ -27,9 +27,9 @@ public class DigitalRelationFacade {
      * @param criteria: 请求参数
      * @return 对象关系数组
      */
-    public static List<RelationProjectCal> query(String groupCode, String projectId, String appId,
-                                                 String userId, QueryCriteria criteria) {
-        CommonResult<List<RelationProjectCal>> result = client.query(groupCode, projectId, appId, userId, criteria);
+    public static List<ObjectRelation> query(String groupCode, String projectId, String appId,
+                                             String userId, QueryCriteria criteria) {
+        CommonResult<List<ObjectRelation>> result = client.query(groupCode, projectId, appId, userId, criteria);
         return ResultHelper.getContent(result);
     }
     /**
@@ -41,9 +41,9 @@ public class DigitalRelationFacade {
      * @param node: 新增对象关系
      * @return 对象关系
      */
-    public static RelationProjectCal createOne(String groupCode, String projectId, String appId,
-                                               String userId, ObjectNode node) {
-        CommonResult<RelationProjectCal> result = client.createOne(groupCode, projectId, appId, userId, node);
+    public static ObjectRelation createOne(String groupCode, String projectId, String appId,
+                                           String userId, ObjectNode node) {
+        CommonResult<ObjectRelation> result = client.createOne(groupCode, projectId, appId, userId, node);
         return ResultHelper.getContent(result);
     }
     /**
@@ -55,9 +55,9 @@ public class DigitalRelationFacade {
      * @param nodes: 新增对象关系集合
      * @return 对象关系数组
      */
-    public static List<RelationProjectCal> create(String groupCode, String projectId, String appId,
-                                                  String userId, List<ObjectNode> nodes) {
-        CommonResult<List<RelationProjectCal>> result = client.create(groupCode, projectId, appId, userId, nodes);
+    public static List<ObjectRelation> create(String groupCode, String projectId, String appId,
+                                              String userId, List<ObjectNode> nodes) {
+        CommonResult<List<ObjectRelation>> result = client.create(groupCode, projectId, appId, userId, nodes);
         return ResultHelper.getContent(result);
     }
     /**
@@ -69,9 +69,9 @@ public class DigitalRelationFacade {
      * @param node: 更新对象关系
      * @return 对象关系
      */
-    public static RelationProjectCal updateOne(String groupCode, String projectId, String appId,
-                                               String userId, ObjectNode node) {
-        CommonResult<RelationProjectCal> result = client.updateOne(groupCode, projectId, appId, userId, node);
+    public static ObjectRelation updateOne(String groupCode, String projectId, String appId,
+                                           String userId, ObjectNode node) {
+        CommonResult<ObjectRelation> result = client.updateOne(groupCode, projectId, appId, userId, node);
         return ResultHelper.getContent(result);
     }
     /**
@@ -83,9 +83,9 @@ public class DigitalRelationFacade {
      * @param nodes: 更新对象关系集合
      * @return 对象关系数组
      */
-    public static List<RelationProjectCal> update(String groupCode, String projectId, String appId,
-                                                  String userId, List<ObjectNode> nodes) {
-        CommonResult<List<RelationProjectCal>> result = client.update(groupCode, projectId, appId, userId, nodes);
+    public static List<ObjectRelation> update(String groupCode, String projectId, String appId,
+                                              String userId, List<ObjectNode> nodes) {
+        CommonResult<List<ObjectRelation>> result = client.update(groupCode, projectId, appId, userId, nodes);
         return ResultHelper.getContent(result);
     }
     /**

+ 132 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationProjectCalClient.java

@@ -0,0 +1,132 @@
+package com.persagy.dmp.digital.client;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.dmp.basic.config.DigitalFeignConfig;
+import com.persagy.dmp.basic.dto.RequestData;
+import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.digital.entity.ObjectDigital;
+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;
+import java.util.Set;
+
+/***
+ * Description:对象管理Client
+ * @author : lijie
+ * @date :2021/8/19 17:38
+ * Update By lijie 2021/8/19 17:38
+ */
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,
+        url = "${persagy.bdtp.rwd.service:}",path = "/rwd/instance/relation/project/cal/")
+public interface DigitalRelationProjectCalClient {
+
+    /**
+     * 查询项目计算关系
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param criteria: 查询条件
+     * @return 项目计算关系数组
+     */
+    @PostMapping("query")
+    CommonResult<List<ObjectNode>> query(@RequestParam("groupCode") String groupCode,
+                                         @RequestParam("projectId") String projectId,
+                                         @RequestParam("appId") String appId,
+                                         @RequestParam("userId") String userId,
+                                         @RequestBody QueryCriteria criteria);
+    /**
+     * 新增项目计算关系-单个新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param node: 新增项目计算关系
+     * @return 项目计算关系
+     */
+    @PostMapping("createOne")
+    CommonResult<ObjectDigital> createOne(@RequestParam("groupCode") String groupCode,
+                                          @RequestParam("projectId") String projectId,
+                                          @RequestParam("appId") String appId,
+                                          @RequestParam("userId") String userId,
+                                          @RequestBody ObjectNode node);
+    /**
+     * 新增项目计算关系-批量新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param nodes: 新增项目计算关系集合
+     * @return 项目计算关系数组
+     */
+    @PostMapping("create")
+    CommonResult<List<ObjectDigital>> create(@RequestParam("groupCode") String groupCode,
+                                             @RequestParam("projectId") String projectId,
+                                             @RequestParam("appId") String appId,
+                                             @RequestParam("userId") String userId,
+                                             @RequestBody List<ObjectNode> nodes);
+    /**
+     * 更新项目计算关系-单个更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param node: 更新项目计算关系
+     * @return 项目计算关系
+     */
+    @PostMapping("updateOne")
+    CommonResult<ObjectDigital> updateOne(@RequestParam("groupCode") String groupCode,
+                                          @RequestParam("projectId") String projectId,
+                                          @RequestParam("appId") String appId,
+                                          @RequestParam("userId") String userId,
+                                          @RequestBody ObjectNode node);
+    /**
+     * 更新项目计算关系-批量更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param nodes: 更新项目计算关系集合
+     * @return 项目计算关系数组
+     */
+    @PostMapping("update")
+    CommonResult<List<ObjectDigital>> update(@RequestParam("groupCode") String groupCode,
+                                             @RequestParam("projectId") String projectId,
+                                             @RequestParam("appId") String appId,
+                                             @RequestParam("userId") String userId,
+                                             @RequestBody List<ObjectNode> nodes);
+    /**
+     * 删除项目计算关系-单个删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param id: 项目计算关系id
+     * @return void
+     */
+    @PostMapping("deleteOne")
+    CommonResult<Void> deleteOne(@RequestParam("groupCode") String groupCode,
+                                 @RequestParam("projectId") String projectId,
+                                 @RequestParam("appId") String appId,
+                                 @RequestParam("userId") String userId,
+                                 @RequestBody String id);
+    /**
+     * 删除项目计算关系-批量删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param ids: 项目计算关系id集合
+     * @return void
+     */
+    @PostMapping("delete")
+    CommonResult<Void> delete(@RequestParam("groupCode") String groupCode,
+                              @RequestParam("projectId") String projectId,
+                              @RequestParam("appId") String appId,
+                              @RequestParam("userId") String userId,
+                              @RequestBody List<String> ids);
+}

+ 56 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/ObjectRelation.java

@@ -0,0 +1,56 @@
+package com.persagy.dmp.digital.entity;
+
+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;
+
+/**
+ * 对象数据
+ * @author Charlie Yu
+ * @date 2021-06-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "dt_relation", autoResultMap = true)
+public class ObjectRelation extends AuditableEntity {
+
+    public static final String OBJ_FROM="obj_from";
+    public static final String OBJ_TO="obj_to";
+    public static final String REL_CODE_HUM="relCode";
+    public static final String OBJ_FROM_HUM="objFrom";
+    public static final String OBJ_TO_HUM="objTo";
+    public static final String RELATION_TO_HUM="relationTo";
+    public static final String RELATION_FROM_HUM="relationFrom";
+
+    /** 项目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;
+    /** 来源对象 */
+    @NotNull(message = "来源对象不允许为空")
+    private String objFrom;
+    /** 目标对象 */
+    @NotNull(message = "目标对象不允许为空")
+    private String objTo;
+    /** 创建应用 */
+    private String createApp;
+    /** 最后修改应用 */
+    private String updateApp;
+}

+ 1 - 6
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/domain/RelationCalSign.java

@@ -1,14 +1,9 @@
-package com.persagy.dmp.rwd.digital.domain;
+package com.persagy.dmp.digital.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.*;
-import lombok.experimental.SuperBuilder;
-
-import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 记录关系的计算标记表,与dt_relation表为一对一关系

+ 69 - 43
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/RelationProjectCal.java

@@ -1,56 +1,82 @@
 package com.persagy.dmp.digital.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 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;
+import lombok.*;
 
 /**
- * 对象数据
- * @author Charlie Yu
- * @date 2021-06-25
+ * 
+ * @TableName relation_project_cal
  */
+@TableName(value ="relation_project_cal")
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = "dt_relation", autoResultMap = true)
+@ToString(callSuper = true)
 public class RelationProjectCal extends AuditableEntity {
 
-    public static final String OBJ_FROM="obj_from";
-    public static final String OBJ_TO="obj_to";
-    public static final String REL_CODE_HUM="relCode";
-    public static final String OBJ_FROM_HUM="objFrom";
-    public static final String OBJ_TO_HUM="objTo";
-    public static final String RELATION_TO_HUM="relationTo";
-    public static final String RELATION_FROM_HUM="relationFrom";
-
-    /** 项目ID */
-    private String projectId;
-    /** 集团编码 */
-    private String groupCode;
-    /** 图例ID */
-    @Length(max = 40)
-    private String graphId;
-    /** 图例编码 */
-    @NotNull(message = "图例编码不允许为空")
-    @Length(max = 40)
+    /**
+     * 图类型
+     */
+    @TableField(value = "graph_code")
     private String graphCode;
-    /** 关系编码 */
-    @NotNull(message = "关系编码不允许为空")
-    @Length(max = 40)
+
+    /**
+     * 关系类型编码
+     */
+    @TableField(value = "rel_code")
     private String relCode;
-    /** 关系值 */
-    private String relValue;
-    /** 来源对象 */
-    @NotNull(message = "来源对象不允许为空")
-    private String objFrom;
-    /** 目标对象 */
-    @NotNull(message = "目标对象不允许为空")
-    private String objTo;
-    /** 创建应用 */
-    private String createApp;
-    /** 最后修改应用 */
-    private String updateApp;
-}
+
+    /**
+     * 是否需要配置源末端
+     */
+    @TableField(value = "source_flag")
+    private Byte sourceFlag;
+
+    /**
+     * 是否自动计算类型
+     */
+    @TableField(value = "automatic_flag")
+    private Byte automaticFlag;
+
+    /**
+     * 手动计算类型 1 禁用  2提示引导 3手动维护
+     */
+    @TableField(value = "manual")
+    private Integer manual;
+
+    /**
+     * 项目id
+     */
+    @TableField(value = "project_id")
+    private String projectId;
+
+    /**
+     * 最后一次自动计算时间
+     */
+    @TableField(value = "computing_time")
+    private String computingTime;
+
+    /**
+     * 计算状态 1初始状态 2需要计算 3计算中 4等待中 5计算失败(如果处于计算中状态,则不再次调用)
+     */
+    @TableField(value = "computational_state")
+    private Byte computationalState;
+
+    /**
+     * 业务分区类型
+     */
+    @TableField(value = "zone_type")
+    private String zoneType;
+
+    /**
+     * 计算版本
+     */
+    @TableField(value = "compute_version")
+    private Byte computeVersion;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}