Procházet zdrojové kódy

新增关系查询的Client

lijie před 3 roky
rodič
revize
8fa1b86a2f
14 změnil soubory, kde provedl 492 přidání a 21 odebrání
  1. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java
  2. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/ObjectRelationMapper.java
  3. 1 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/ObjectRelationIService.java
  4. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/impl/ObjectRelationIServiceImpl.java
  5. 1 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectRelationService.java
  6. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectRelationServiceImpl.java
  7. 13 1
      dmp-business/dmp-rwd/src/main/resources/bootstrap.yml
  8. 5 2
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/config/DigitalFeignConfig.java
  9. 1 1
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/config/FeignInterceptor.java
  10. 113 5
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjectClient.java
  11. 100 3
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjectFacade.java
  12. 133 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationClient.java
  13. 120 0
      dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalRelationFacade.java
  14. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/entity/ObjectRelation.java

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

@@ -10,9 +10,9 @@ 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.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
-import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/ObjectRelationMapper.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.entity.ObjectRelation;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 
 /**
  * 关系数据 DAO

+ 1 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/ObjectRelationIService.java

@@ -1,8 +1,7 @@
 package com.persagy.dmp.rwd.digital.iservice;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.persagy.dmp.define.entity.RelationDefine;
-import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 
 /**
  * 对象关系-IService

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

@@ -1,8 +1,8 @@
 package com.persagy.dmp.rwd.digital.iservice.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper;
-import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.iservice.ObjectRelationIService;
 import org.springframework.stereotype.Service;
 

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

@@ -3,8 +3,7 @@ package com.persagy.dmp.rwd.digital.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
-
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import java.util.List;
 
 /**

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

@@ -4,9 +4,9 @@ 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.persagy.dmp.common.constant.ValidEnum;
+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.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.iservice.ObjectRelationIService;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import org.springframework.beans.factory.annotation.Autowired;

+ 13 - 1
dmp-business/dmp-rwd/src/main/resources/bootstrap.yml

@@ -8,4 +8,16 @@ spring:
 config:
   file:
     absolute:
-      path: ${CONFIG_FILE_PATH:D:\SpringCloud}
+      path: ${CONFIG_FILE_PATH:D:\SpringCloud}
+#feign:
+#  compression:
+#    request:
+#      # 开启请求压缩
+#      enabled: true
+#      # 配置压缩的 MIME TYPE
+#      mime-types: text/xml,application/xml,application/json
+#      # 配置压缩数据大小的下限
+#      min-request-size: 2048
+#    response:
+#      # 开启响应压缩
+#      enabled: true

+ 5 - 2
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/config/DigitalFeignConfig.java

@@ -6,6 +6,8 @@ import feign.codec.Encoder;
 import feign.form.spring.SpringFormEncoder;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
@@ -41,7 +43,8 @@ public class DigitalFeignConfig {
     }
 
     @Bean
-    RequestInterceptor feignInterceptor(){
-        return new FeignInterceptor();
+    @ConditionalOnMissingBean({RequestInterceptor.class})
+    RequestInterceptor digitalFeignInterceptor(){
+        return new DigitalFeignInterceptor();
     }
 }

+ 1 - 1
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/config/FeignInterceptor.java

@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @Slf4j
-public class FeignInterceptor implements RequestInterceptor {
+public class DigitalFeignInterceptor implements RequestInterceptor {
 
     @Override
     public void apply(RequestTemplate template) {

+ 113 - 5
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjectClient.java

@@ -1,5 +1,6 @@
 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;
@@ -20,7 +21,8 @@ import java.util.Set;
  * @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:}")
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,
+        url = "${persagy.bdtp.rwd.service:}",path = "/rwd/instance/object/")
 public interface DigitalObjectClient {
 
     /**
@@ -30,9 +32,9 @@ public interface DigitalObjectClient {
      * @param appId: 应用ID
      * @param userId: 用户ID
      * @param projectIds: 项目id数组
-     * @return 类型定义
+     * @return 对象数组
      */
-    @PostMapping("/rwd/instance/object/batchQueryProjectByIds")
+    @PostMapping("batchQueryProjectByIds")
     CommonResult<List<ObjectDigital>> batchQueryProjectByIds(
             @RequestParam("groupCode") String groupCode,
             @RequestParam("projectId") String projectId,
@@ -47,13 +49,119 @@ public interface DigitalObjectClient {
      * @param appId: 应用ID
      * @param userId: 用户ID
      * @param requestData: 查询条件
-     * @return 类型定义
+     * @return 对象数组
      */
-    @PostMapping("/rwd/instance/object/batchQueryProjectByGroupManageZoneIds")
+    @PostMapping("batchQueryProjectByGroupManageZoneIds")
     CommonResult<List<ObjectDigital>> batchQueryProjectByGroupManageZoneIds(
             @RequestParam("groupCode") String groupCode,
             @RequestParam("projectId") String projectId,
             @RequestParam("appId") String appId,
             @RequestParam("userId") String userId,
             @RequestBody RequestData requestData);
+
+    /**
+     * 查询物理世界对象
+     * @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);
 }

+ 100 - 3
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjectFacade.java

@@ -1,6 +1,7 @@
 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;
@@ -12,7 +13,7 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * 数据字典Client门面
+ * 物理世界对象Client门面
  * @author Charlie Yu
  * @date 2021-05-15
  */
@@ -27,7 +28,7 @@ public class DigitalObjectFacade {
      * @param appId: 应用ID
      * @param userId: 用户ID
      * @param projectIds: 项目id数组
-     * @return 类型定义
+     * @return 对象数组
      */
     public static List<ObjectDigital> batchQueryProjectByIds(String groupCode, String projectId, String appId,
                                                              String userId, Set<String> projectIds) {
@@ -42,7 +43,7 @@ public class DigitalObjectFacade {
      * @param appId: 应用ID
      * @param userId: 用户ID
      * @param requestData: 请求参数
-     * @return 类型定义
+     * @return 对象数组
      */
     public static List<ObjectDigital> batchQueryProjectByGroupManageZoneIds(String groupCode, String projectId, String appId,
                                                              String userId, RequestData requestData) {
@@ -50,4 +51,100 @@ public class DigitalObjectFacade {
                 userId, requestData);
         return ResultHelper.getContent(result);
     }
+    /**
+     * 查询物理世界对象
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param criteria: 请求参数
+     * @return 对象数组
+     */
+    public static List<ObjectNode> query(String groupCode, String projectId, String appId,
+                                                             String userId, QueryCriteria criteria) {
+        CommonResult<List<ObjectNode>> result = client.query(groupCode, projectId, appId, userId, criteria);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 新增物理世界对象-单个新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param node: 新增对象
+     * @return 对象
+     */
+    public static ObjectDigital createOne(String groupCode, String projectId, String appId,
+                                                             String userId, ObjectNode node) {
+        CommonResult<ObjectDigital> result = client.createOne(groupCode, projectId, appId, userId, node);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 新增物理世界对象-批量新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param nodes: 新增对象集合
+     * @return 对象数组
+     */
+    public static List<ObjectDigital> create(String groupCode, String projectId, String appId,
+                                                             String userId, List<ObjectNode> nodes) {
+        CommonResult<List<ObjectDigital>> result = client.create(groupCode, projectId, appId, userId, nodes);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 更新物理世界对象-单个更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param node: 更新对象
+     * @return 对象
+     */
+    public static ObjectDigital updateOne(String groupCode, String projectId, String appId,
+                                                             String userId, ObjectNode node) {
+        CommonResult<ObjectDigital> result = client.updateOne(groupCode, projectId, appId, userId, node);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 更新物理世界对象-批量更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param nodes: 更新对象集合
+     * @return 对象数组
+     */
+    public static List<ObjectDigital> update(String groupCode, String projectId, String appId,
+                                                             String userId, List<ObjectNode> nodes) {
+        CommonResult<List<ObjectDigital>> result = client.update(groupCode, projectId, appId, userId, nodes);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 删除物理世界对象-单个删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param id: 对象id
+     * @return 对象
+     */
+    public static void deleteOne(String groupCode, String projectId, String appId,
+                                                             String userId, String id) {
+        client.deleteOne(groupCode, projectId, appId, userId, id);
+    }
+    /**
+     * 删除物理世界对象-批量删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param ids: 对象id数组
+     * @return 对象数组
+     */
+    public static void delete(String groupCode, String projectId, String appId,
+                                                             String userId, List<String> ids) {
+        client.delete(groupCode, projectId, appId, userId, ids);
+    }
 }

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

@@ -0,0 +1,133 @@
+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 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/")
+public interface DigitalRelationClient {
+
+    /**
+     * 查询物理世界对象关系
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param criteria: 查询条件
+     * @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);
+    /**
+     * 新增物理世界对象关系-单个新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param node: 新增对象
+     * @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);
+    /**
+     * 新增物理世界对象关系-批量新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param nodes: 新增对象集合
+     * @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);
+    /**
+     * 更新物理世界对象关系-单个更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param node: 更新对象
+     * @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);
+    /**
+     * 更新物理世界对象关系-批量更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param nodes: 更新对象集合
+     * @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);
+    /**
+     * 删除物理世界对象关系-单个删除
+     * @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);
+}

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

@@ -0,0 +1,120 @@
+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 java.util.List;
+import java.util.Set;
+
+/**
+ * 物理世界对象Client门面
+ * @author Charlie Yu
+ * @date 2021-05-15
+ */
+public class DigitalRelationFacade {
+
+    private static DigitalRelationClient client = SpringUtil.getBean(DigitalRelationClient.class);
+
+    /**
+     * 查询物理世界对象关系
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @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);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 新增物理世界对象关系-单个新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @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);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 新增物理世界对象关系-批量新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @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);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 更新物理世界对象关系-单个更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @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);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 更新物理世界对象关系-批量更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @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);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 删除物理世界对象关系-单个删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param id: 对象关系id
+     * @return 对象关系
+     */
+    public static void deleteOne(String groupCode, String projectId, String appId,
+                                                             String userId, String id) {
+        client.deleteOne(groupCode, projectId, appId, userId, id);
+    }
+    /**
+     * 删除物理世界对象关系-批量删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param ids: 对象关系id数组
+     * @return 对象关系数组
+     */
+    public static void delete(String groupCode, String projectId, String appId,
+                                                             String userId, List<String> ids) {
+        client.delete(groupCode, projectId, appId, userId, ids);
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.persagy.dmp.rwd.digital.entity;
+package com.persagy.dmp.digital.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;