Преглед изворни кода

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

lijie пре 3 година
родитељ
комит
127953bf4a
16 измењених фајлова са 299 додато и 167 уклоњено
  1. 7 9
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java
  2. 16 19
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java
  3. 3 6
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/RelationCaclController.java
  4. 157 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/RelationProjectCalController.java
  5. 2 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/ObjectRelationMapper.java
  6. 8 8
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectRelationService.java
  7. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/RelationCaclService.java
  8. 10 10
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectRelationServiceImpl.java
  9. 27 32
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCaclServiceImpl.java
  10. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/utils/ObjectDigitalCriteriaHelper.java
  11. 1 1
      dmp-business/dmp-rwd/src/main/resources/mapper/ObjectRelationMapper.xml
  12. 11 12
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationCaclClient.java
  13. 9 13
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationCaclFacade.java
  14. 26 29
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationClient.java
  15. 16 19
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationFacade.java
  16. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/ObjectRelation.java

+ 7 - 9
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.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
@@ -33,7 +33,6 @@ import com.persagy.dmp.rwd.basic.constant.DigitalRelCode;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.digital.service.ProjectBusinessService;
 import com.persagy.dmp.rwd.digital.utils.ObjectDigitalCriteriaHelper;
-import lombok.SneakyThrows;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -43,7 +42,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -305,17 +303,17 @@ public class ObjectDigitalController{
         if (StrUtil.isNotBlank(requestData.getFloorId())){
             // criteria条件
             ObjectNode criteriaObj = objectMapper.createObjectNode();
-            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);
+            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);
         }
         // 系统id
         if (StrUtil.isNotBlank(requestData.getSystemId())){
             // criteria条件
             ObjectNode criteriaObj = objectMapper.createObjectNode();
-            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);
+            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);
         }
         // installLocation安装位置
         if (StrUtil.isNotBlank(requestData.getInstallLocation())){

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

@@ -1,10 +1,8 @@
 package com.persagy.dmp.rwd.digital.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
@@ -14,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.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
@@ -26,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -42,18 +39,18 @@ public class ObjectRelationController {
     private IObjectRelationService service;
 
     @PostMapping("query")
-    public CommonResult<List<ObjectRelation>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<List<RelationProjectCal>> 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<ObjectRelation> wrapper = new QueryWrapper<>();
+        QueryWrapper<RelationProjectCal> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
         ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         // 转换查询条件
-        QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectRelation.class);
+        QueryCriteriaHelper.toWrapper(wrapper, criteria, RelationProjectCal.class);
         Page page = QueryCriteriaHelper.toPage(criteria);
         if(criteria.isOnlyCount()) {
             Integer total = service.queryCount(wrapper);
@@ -65,10 +62,10 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/createOne")
-    public CommonResult<ObjectRelation> create(@Valid @RequestBody ObjectRelation vo){
+    public CommonResult<RelationProjectCal> create(@Valid @RequestBody RelationProjectCal vo){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-        List<ObjectRelation> voList = CollUtil.newArrayList(vo);
+        List<RelationProjectCal> voList = CollUtil.newArrayList(vo);
         //创建默认条件
         createDefaultValue(voList);
         //新增对象关系
@@ -77,7 +74,7 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/create")
-    public CommonResult<List<ObjectRelation>> createBatch(@Valid @RequestBody List<ObjectRelation> voList){
+    public CommonResult<List<RelationProjectCal>> createBatch(@Valid @RequestBody List<RelationProjectCal> voList){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
         //创建默认条件
@@ -88,10 +85,10 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/updateOne")
-    public CommonResult<ObjectRelation> update(@Valid @RequestBody ObjectRelation vo){
+    public CommonResult<RelationProjectCal> update(@Valid @RequestBody RelationProjectCal vo){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
-        List<ObjectRelation> voList = CollUtil.newArrayList(vo);
+        List<RelationProjectCal> voList = CollUtil.newArrayList(vo);
         //修改默认条件
         createDefaultValue(voList);
         //修改对象关系
@@ -100,7 +97,7 @@ public class ObjectRelationController {
     }
 
     @PostMapping("/update")
-    public CommonResult<List<ObjectRelation>> updateBatch(@Valid @RequestBody List<ObjectRelation> voList){
+    public CommonResult<List<RelationProjectCal>> updateBatch(@Valid @RequestBody List<RelationProjectCal> voList){
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
         //修改默认条件
@@ -122,16 +119,16 @@ public class ObjectRelationController {
      * @return
      */
     @PostMapping("/delete")
-    public CommonResult<List<ObjectRelation>> deleteBatch(@RequestBody QueryCriteria criteria){
+    public CommonResult<List<RelationProjectCal>> deleteBatch(@RequestBody QueryCriteria criteria){
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
-        QueryWrapper<ObjectRelation> wrapper = new QueryWrapper<>();
+        QueryWrapper<RelationProjectCal> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
         ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         // 转换查询条件
-        QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectRelation.class);
-        List<ObjectRelation> delList = service.delete(wrapper);
+        QueryCriteriaHelper.toWrapper(wrapper, criteria, RelationProjectCal.class);
+        List<RelationProjectCal> delList = service.delete(wrapper);
         return ResultHelper.multi(delList,delList.size());
     }
 
@@ -139,7 +136,7 @@ public class ObjectRelationController {
      * 创建默认条件
      * @param voList
      */
-    private void createDefaultValue(List<ObjectRelation> voList){
+    private void createDefaultValue(List<RelationProjectCal> voList){
         String groupCode = AppContext.getContext().getGroupCode();
         if(StringUtils.isEmpty(groupCode)){
             //默认集团
@@ -150,7 +147,7 @@ public class ObjectRelationController {
             //默认项目
             projectId = CommonConstant.DEFAULT_ID;
         }
-        for (ObjectRelation vo : voList) {
+        for (RelationProjectCal vo : voList) {
             vo.setGroupCode(groupCode);
             vo.setProjectId(projectId);
             if(vo.getValid() == null) {

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

@@ -7,8 +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.common.utils.ResultHelper;
-import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 import com.persagy.dmp.rwd.digital.service.RelationCaclService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /***
@@ -33,7 +31,6 @@ public class RelationCaclController {
 
     private final RelationCaclService relationCaclService;
 
-
     /***
      * Description: 根据id,localId,name,localName,CADID及关系类型信息,对象分类信息创建关系
      * @param requestData : 请求参数
@@ -43,7 +40,7 @@ public class RelationCaclController {
      * Update By lijie 2021/9/2 20:20
      */
     @PostMapping("createObjRelationsByKeywordAndObjType")
-    public CommonResult<List<ObjectRelation>> createObjRelationsByKeywordAndObjType(@RequestBody RequestData requestData){
+    public CommonResult<List<RelationProjectCal>> createObjRelationsByKeywordAndObjType(@RequestBody RequestData requestData){
         // 校验必填项
         if (StrUtil.isBlank(requestData.getGraphCode())
                 || StrUtil.isBlank(requestData.getRelCode())
@@ -68,7 +65,7 @@ public class RelationCaclController {
      * Update By lijie 2021/9/2 20:20
      */
     @PostMapping("deleteObjRelationsByRelId")
-    public CommonResult<List<ObjectRelation>> deleteObjRelationsByRelId(@Validated @RequestBody ObjectRelation objectRelation){
+    public CommonResult<List<RelationProjectCal>> deleteObjRelationsByRelId(@Validated @RequestBody RelationProjectCal objectRelation){
         return relationCaclService.deleteObjRelationsByRelId(objectRelation);
     }
 

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

@@ -0,0 +1,157 @@
+package com.persagy.dmp.rwd.digital.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.constant.ValidEnum;
+import com.persagy.dmp.common.context.AppContext;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ParamCheckUtil;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.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;
+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;
+
+/***
+ * Description: 关系计算入口
+ * @author : lijie
+ * @date :2021/9/2 21:19
+ * Update By lijie 2021/9/2 21:19
+ */
+@RestController
+@RequestMapping("/rwd/instance/object/compatible/")
+@RequiredArgsConstructor
+public class RelationProjectCalController {
+
+    private final RelationProjectCalService service;
+
+    @PostMapping("query")
+    public CommonResult<List<RelationProjectCal>> 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<>();
+        // 添加所属项目条件
+        ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
+        // 转换查询条件
+        QueryCriteriaHelper.toWrapper(wrapper, criteria, RelationProjectCal.class);
+        Page page = QueryCriteriaHelper.toPage(criteria);
+        if(criteria.isOnlyCount()) {
+            int total = service.count(wrapper);
+            page.setTotal(total);
+        } else {
+            page = service.page(QueryCriteriaHelper.toPage(criteria), wrapper);
+        }
+        return ResultHelper.multi(page.getRecords(), page.getTotal());
+    }
+
+    @PostMapping("/createOne")
+    public CommonResult<RelationProjectCal> create(@Valid @RequestBody RelationProjectCal vo){
+        //基础参数校验
+        ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
+        List<RelationProjectCal> voList = CollUtil.newArrayList(vo);
+        //创建默认条件
+        createDefaultValue(voList);
+        //新增对象关系
+        service.saveBatch(voList);
+        return ResultHelper.single(vo);
+    }
+
+    @PostMapping("/create")
+    public CommonResult<List<RelationProjectCal>> createBatch(@Valid @RequestBody List<RelationProjectCal> voList){
+        //基础参数校验
+        ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
+        //创建默认条件
+        createDefaultValue(voList);
+        service.saveBatch(voList);
+        //批量新增对象关系
+        return ResultHelper.multi(voList);
+    }
+
+    @PostMapping("/updateOne")
+    public CommonResult<RelationProjectCal> update(@Valid @RequestBody RelationProjectCal vo){
+        //基础参数校验
+        ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
+        List<RelationProjectCal> voList = CollUtil.newArrayList(vo);
+        //修改默认条件
+        createDefaultValue(voList);
+        //修改对象关系
+        service.updateBatchById(voList);
+        return ResultHelper.single(vo);
+    }
+
+    @PostMapping("/update")
+    public CommonResult<List<RelationProjectCal>> updateBatch(@Valid @RequestBody List<RelationProjectCal> voList){
+        //基础参数校验
+        ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
+        //修改默认条件
+        createDefaultValue(voList);
+        //批量修改对象关系
+        service.updateBatchById(voList);
+        return ResultHelper.multi(voList);
+    }
+
+    @PostMapping("/deleteOne")
+    @Deprecated
+    public CommonResult delete(@RequestBody String id){
+        if(StringUtils.isEmpty(id)){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
+        service.removeById(id);
+        return ResultHelper.success();
+    }
+
+    @PostMapping("/delete")
+    @Deprecated
+    public CommonResult deleteBatch(@RequestBody List<String> ids){
+        if(ids == null || ids.size()<=0){
+            throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
+        }
+        service.removeByIds(ids);
+        return ResultHelper.success();
+    }
+
+    /**
+     * 创建默认条件
+     * @param voList
+     */
+    private void createDefaultValue(List<RelationProjectCal> 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 (RelationProjectCal vo : voList) {
+            vo.setProjectId(projectId);
+            if(vo.getValid() == null) {
+                vo.setValid(ValidEnum.TRUE.getType());
+            }
+        }
+    }
+
+
+
+
+}

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

@@ -2,10 +2,9 @@ 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.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -14,7 +13,7 @@ import java.util.Set;
  * @author Charlie Yu
  * @date 2021-07-08
  */
-public interface ObjectRelationMapper extends BaseMapper<ObjectRelation> {
+public interface ObjectRelationMapper extends BaseMapper<RelationProjectCal> {
     /***
      * Description: 根据对象id查询关系
      * @param objIds : 对象id

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

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

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

@@ -3,7 +3,6 @@ package com.persagy.dmp.rwd.digital.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -16,24 +15,20 @@ 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.RelationProjectCal;
 import com.persagy.dmp.rwd.basic.constant.BusinessErrorRwdCode;
 import com.persagy.dmp.rwd.digital.dao.ObjectDigitalMapper;
-import com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper;
 import com.persagy.dmp.rwd.digital.domain.RelationCalSign;
-import com.persagy.dmp.rwd.digital.domain.RelationProjectCal;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import com.persagy.dmp.rwd.digital.service.RelationCaclService;
 import com.persagy.dmp.rwd.digital.service.RelationCalSignService;
 import com.persagy.dmp.rwd.digital.service.RelationProjectCalService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.validator.constraints.Length;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -58,7 +53,7 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      */
     @Override
     @Transactional
-    public CommonResult<List<ObjectRelation>> createObjRelationsByKeywordAndObjType(@RequestBody RequestData requestData) {
+    public CommonResult<List<RelationProjectCal>> createObjRelationsByKeywordAndObjType(@RequestBody RequestData requestData) {
         // 0.更新计算时间,根据项目id和图类型编码及关系类型编码
         updateComputeTimeByProjectAndGraphCodeAndRelCode(requestData.getGraphCode(),requestData.getRelCode());
         // 根据对象信息点和对象内容(主/副)查询对象,然后添加关系及计算标记
@@ -93,12 +88,12 @@ public class RelationCaclServiceImpl implements RelationCaclService {
                 .filter(objectDigital -> !objectDigital.getMainFlag())
                 .collect(Collectors.toList());
         // 4.3 根据主对象id和从对象id数组查询已经存在的关系
-        Map<String,ObjectRelation> relationMap =
+        Map<String, RelationProjectCal> relationMap =
                 queryObjectRelationMapByFromIdAndToIds(masterObjectDigital.getId(),slaveObjectDigitals
                 .stream().map(BaseEntity::getId).collect(Collectors.toList()));
         // 4.3 创建关系
-        List<ObjectRelation> addRelations = new ArrayList<>();
-        List<ObjectRelation> updateRelations = new ArrayList<>();
+        List<RelationProjectCal> addRelations = new ArrayList<>();
+        List<RelationProjectCal> updateRelations = new ArrayList<>();
         List<RelationCalSign> relationCalSigns = new ArrayList<>();
         boolean flag = StrUtil.isNotBlank(requestData.getSign()) && NumberUtil.isInteger(requestData.getSign());
         for (ObjectDigital slaveObjectDigital : slaveObjectDigitals) {
@@ -110,7 +105,7 @@ public class RelationCaclServiceImpl implements RelationCaclService {
                             masterObjectDigital.getId(),
                             slaveObjectDigital.getId());
             if (relationMap.containsKey(uniqueKey)){
-                ObjectRelation objectRelation = relationMap.get(uniqueKey);
+                RelationProjectCal objectRelation = relationMap.get(uniqueKey);
                 objectRelation.setUpdateApp(AppContext.getContext().getAppId());
                 objectRelation.setModifier(AppContext.getContext().getAccountId());
                 if (requestData.getHasRelValue()){
@@ -129,7 +124,7 @@ public class RelationCaclServiceImpl implements RelationCaclService {
                 continue;
             }
             // 生成插入关系
-            ObjectRelation objectRelation = new ObjectRelation();
+            RelationProjectCal objectRelation = new RelationProjectCal();
             objectRelation.setId(IdWorker.getIdStr());
             objectRelation.setGraphCode(requestData.getGraphCode());
             objectRelation.setGroupCode(AppContext.getContext().getGroupCode());
@@ -180,22 +175,22 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      */
     @Override
     @Transactional
-    public CommonResult<List<ObjectRelation>> deleteObjRelationsByRelId(ObjectRelation objectRelation) {
+    public CommonResult<List<RelationProjectCal>> deleteObjRelationsByRelId(RelationProjectCal objectRelation) {
         // 1.先查询关系
-        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);
+        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);
         if (CollUtil.isEmpty(objectRelations)){
             throw new BusinessException(BusinessErrorRwdCode.A7201.getCode(),BusinessErrorRwdCode.A7201.getDesc());
         }
         // 2.先更新计算时间
         updateComputeTimeByProjectAndGraphCodeAndRelCode(objectRelation.getGraphCode(),objectRelation.getRelCode());
         // 3.删除关系
-        for (ObjectRelation relation : objectRelations) {
+        for (RelationProjectCal relation : objectRelations) {
             relation.setValid(0);
             relation.setModifier(AppContext.getContext().getAccountId());
             relation.setUpdateApp(AppContext.getContext().getAppId());
@@ -214,11 +209,11 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      * Update By lijie 2021/9/4 23:14
      */
     private void updateComputeTimeByProjectAndGraphCodeAndRelCode(String graphCode,String relCode) {
-        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();
+        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();
         relationProjectCal.setComputingTime(DateUtil.format(new Date(),"yyyyMMddHHmmss"));
         relationProjectCalService.update(relationProjectCal,updateWrapper);
     }
@@ -233,15 +228,15 @@ public class RelationCaclServiceImpl implements RelationCaclService {
      * @date :2021/9/3 16:29
      * Update By lijie 2021/9/3 16:29
      */
-    private Map<String, ObjectRelation> queryObjectRelationMapByFromIdAndToIds(String fromId, List<String> toIds) {
+    private Map<String, RelationProjectCal> queryObjectRelationMapByFromIdAndToIds(String fromId, List<String> toIds) {
         if (StrUtil.isBlank(fromId) || CollUtil.isEmpty(toIds)){
             return new HashMap<>();
         }
-        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);
+        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);
         if (CollUtil.isEmpty(objectRelations)){
             return new HashMap<>();
         }

+ 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.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 
 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 ? ObjectRelation.OBJ_FROM : ObjectRelation.OBJ_TO;
+        String selectKey = isFrom ? RelationProjectCal.OBJ_FROM : RelationProjectCal.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.ObjectRelation">
+    <resultMap id="BaseResultMap" type="com.persagy.dmp.digital.entity.RelationProjectCal">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="groupCode" column="group_code" jdbcType="VARCHAR"/>
             <result property="projectId" column="project_id" jdbcType="VARCHAR"/>

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

@@ -3,14 +3,13 @@ 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.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 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.Map;
 
 /***
  * Description: 关系计算入口 Client
@@ -32,11 +31,11 @@ public interface DigitalRelationCaclClient {
      * @return
      */
     @PostMapping("createObjRelationsByKeywordAndObjType")
-    CommonResult<List<ObjectRelation>> createObjRelationsByKeywordAndObjType(@RequestParam("groupCode") String groupCode,
-                                                                             @RequestParam("projectId") String projectId,
-                                                                            @RequestParam("appId") String appId,
-                                                                            @RequestParam("userId") String userId,
-                                                                            @RequestBody RequestData requestData);
+    CommonResult<List<RelationProjectCal>> createObjRelationsByKeywordAndObjType(@RequestParam("groupCode") String groupCode,
+                                                                                 @RequestParam("projectId") String projectId,
+                                                                                 @RequestParam("appId") String appId,
+                                                                                 @RequestParam("userId") String userId,
+                                                                                 @RequestBody RequestData requestData);
     /**
      * 根据项目ID查询设备数量和待报废设备数量统计
      * @param groupCode: 集团编码
@@ -47,9 +46,9 @@ public interface DigitalRelationCaclClient {
      * @return
      */
     @PostMapping("deleteObjRelationsByRelId")
-    CommonResult<List<ObjectRelation>> deleteObjRelationsByRelId(@RequestParam("groupCode") String groupCode,
-                                                                 @RequestParam("projectId") String projectId,
-                                                                 @RequestParam("appId") String appId,
-                                                                 @RequestParam("userId") String userId,
-                                                                 @RequestBody ObjectRelation objectRelation);
+    CommonResult<List<RelationProjectCal>> deleteObjRelationsByRelId(@RequestParam("groupCode") String groupCode,
+                                                                     @RequestParam("projectId") String projectId,
+                                                                     @RequestParam("appId") String appId,
+                                                                     @RequestParam("userId") String userId,
+                                                                     @RequestBody RelationProjectCal objectRelation);
 }

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

@@ -3,14 +3,10 @@ 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.common.utils.ResultHelper;
-import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 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.Map;
 
 /***
  * Description: 关系计算入口 Client 门面
@@ -32,10 +28,10 @@ public class DigitalRelationCaclFacade {
      * @return
      */
     @PostMapping("createObjRelationsByKeywordAndObjType")
-    public List<ObjectRelation> createObjRelationsByKeywordAndObjType(String groupCode, String projectId,
-                                                                      String appId, String userId,
-                                                                      RequestData requestData){
-        CommonResult<List<ObjectRelation>> relations =
+    public List<RelationProjectCal> createObjRelationsByKeywordAndObjType(String groupCode, String projectId,
+                                                                          String appId, String userId,
+                                                                          RequestData requestData){
+        CommonResult<List<RelationProjectCal>> relations =
                 client.createObjRelationsByKeywordAndObjType(groupCode, projectId, appId, userId, requestData);
         return relations.getData();
     }
@@ -49,10 +45,10 @@ public class DigitalRelationCaclFacade {
      * @return
      */
     @PostMapping("deleteObjRelationsByRelId")
-    public List<ObjectRelation> deleteObjRelationsByRelId(String groupCode, String projectId,
-                                                          String appId, String userId,
-                                                          ObjectRelation objectRelation){
-        CommonResult<List<ObjectRelation>> relations =
+    public List<RelationProjectCal> deleteObjRelationsByRelId(String groupCode, String projectId,
+                                                              String appId, String userId,
+                                                              RelationProjectCal objectRelation){
+        CommonResult<List<RelationProjectCal>> relations =
                 client.deleteObjRelationsByRelId(groupCode, projectId, appId, userId, objectRelation);
         return relations.getData();
     }

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

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

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

@@ -2,15 +2,12 @@ package com.persagy.dmp.digital.client;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-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.common.utils.ResultHelper;
-import com.persagy.dmp.digital.entity.ObjectDigital;
-import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.entity.RelationProjectCal;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 物理世界对象Client门面
@@ -30,9 +27,9 @@ public class DigitalRelationFacade {
      * @param criteria: 请求参数
      * @return 对象关系数组
      */
-    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);
+    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);
         return ResultHelper.getContent(result);
     }
     /**
@@ -44,9 +41,9 @@ public class DigitalRelationFacade {
      * @param node: 新增对象关系
      * @return 对象关系
      */
-    public static ObjectRelation createOne(String groupCode, String projectId, String appId,
-                                                             String userId, ObjectNode node) {
-        CommonResult<ObjectRelation> result = client.createOne(groupCode, projectId, appId, userId, node);
+    public static RelationProjectCal createOne(String groupCode, String projectId, String appId,
+                                               String userId, ObjectNode node) {
+        CommonResult<RelationProjectCal> result = client.createOne(groupCode, projectId, appId, userId, node);
         return ResultHelper.getContent(result);
     }
     /**
@@ -58,9 +55,9 @@ public class DigitalRelationFacade {
      * @param nodes: 新增对象关系集合
      * @return 对象关系数组
      */
-    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);
+    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);
         return ResultHelper.getContent(result);
     }
     /**
@@ -72,9 +69,9 @@ public class DigitalRelationFacade {
      * @param node: 更新对象关系
      * @return 对象关系
      */
-    public static ObjectRelation updateOne(String groupCode, String projectId, String appId,
-                                                             String userId, ObjectNode node) {
-        CommonResult<ObjectRelation> result = client.updateOne(groupCode, projectId, appId, userId, node);
+    public static RelationProjectCal updateOne(String groupCode, String projectId, String appId,
+                                               String userId, ObjectNode node) {
+        CommonResult<RelationProjectCal> result = client.updateOne(groupCode, projectId, appId, userId, node);
         return ResultHelper.getContent(result);
     }
     /**
@@ -86,9 +83,9 @@ public class DigitalRelationFacade {
      * @param nodes: 更新对象关系集合
      * @return 对象关系数组
      */
-    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);
+    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);
         return ResultHelper.getContent(result);
     }
     /**

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

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "dt_relation", autoResultMap = true)
-public class ObjectRelation extends AuditableEntity {
+public class RelationProjectCal extends AuditableEntity {
 
     public static final String OBJ_FROM="obj_from";
     public static final String OBJ_TO="obj_to";