更新starter

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalDefineClient.java

@@ -3,6 +3,7 @@ package com.persagy.dmp.define.client;
 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.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -17,7 +18,8 @@ import java.util.List;
  * @author Charlie Yu
  * @date 2021-05-15
  */
-@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/def/class")
 public interface DigitalDefineClient {
 
     /**
@@ -29,11 +31,102 @@ public interface DigitalDefineClient {
      * @param criteria 查询条件
      * @return 类型定义
      */
-    @PostMapping("/define/type/query")
+    @PostMapping("")
     CommonResult<List<ObjectTypeDefine>> queryObjectType(
             @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 vo: 新增对象类型对象
+     * @return 对象类型对象
+     */
+    @PostMapping("create")
+    CommonResult<ObjectTypeDefine> create(@RequestParam("groupCode") String groupCode,
+                                          @RequestParam("projectId") String projectId,
+                                          @RequestParam("appId") String appId,
+                                          @RequestParam("userId") String userId,
+                                          @RequestBody ObjectTypeDefine vo);
+    /**
+     * 新增对象类型对象-批量新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param voList: 新增对象类型对象数组
+     * @return 对象类型对象数组
+     */
+    @PostMapping("createBatch")
+    CommonResult<List<ObjectTypeDefine>> createBatch(@RequestParam("groupCode") String groupCode,
+                                                     @RequestParam("projectId") String projectId,
+                                                     @RequestParam("appId") String appId,
+                                                     @RequestParam("userId") String userId,
+                                                     @RequestBody List<ObjectTypeDefine> voList);
+    /**
+     * 更新对象类型对象-单个更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param vo: 更新对象类型对象
+     * @return 对象类型对象
+     */
+    @PostMapping("update")
+    CommonResult<ObjectTypeDefine> update(@RequestParam("groupCode") String groupCode,
+                                          @RequestParam("projectId") String projectId,
+                                          @RequestParam("appId") String appId,
+                                          @RequestParam("userId") String userId,
+                                          @RequestBody ObjectTypeDefine vo);
+    /**
+     * 更新对象类型对象-批量更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param voList: 更新对象类型对象数组
+     * @return 对象类型对象数组
+     */
+    @PostMapping("updateBatch")
+    CommonResult<List<ObjectTypeDefine>> updateBatch(@RequestParam("groupCode") String groupCode,
+                                                     @RequestParam("projectId") String projectId,
+                                                     @RequestParam("appId") String appId,
+                                                     @RequestParam("userId") String userId,
+                                                     @RequestBody List<ObjectTypeDefine> voList);
+    /**
+     * 删除对象类型-单个删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param id: 对象类型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 String id);
+    /**
+     * 删除对象类型-批量删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param ids: 对象类型id数组
+     * @return void
+     */
+    @PostMapping("deleteBatch")
+    CommonResult<Void> deleteBatch(@RequestParam("groupCode") String groupCode,
+                                   @RequestParam("projectId") String projectId,
+                                   @RequestParam("appId") String appId,
+                                   @RequestParam("userId") String userId,
+                                   @RequestBody List<String> ids);
 }

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalDefineFacade.java

@@ -4,6 +4,7 @@ import cn.hutool.extra.spring.SpringUtil;
 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.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 
 import java.util.List;
@@ -30,4 +31,94 @@ public class DigitalDefineFacade {
         CommonResult<List<ObjectTypeDefine>> result = client.queryObjectType(groupCode, projectId, appId, userId, criteria);
         return ResultHelper.getContent(result);
     }
+
+    /**
+     * 查询对象类型-原样返回结果
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param criteria 查询条件
+     * @return 对象类型对象集合
+     */
+    public static CommonResult<List<ObjectTypeDefine>> queryPrototype(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
+        return client.queryObjectType(groupCode, projectId, appId, userId, criteria);
+    }
+
+    /**
+     * 创建对象类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param vo 对象类型对象
+     * @return 对象类型对象
+     */
+    public static ObjectTypeDefine create(String groupCode, String projectId, String appId, String userId, ObjectTypeDefine vo) {
+        CommonResult<ObjectTypeDefine> commonResult = client.create(groupCode, projectId, appId, userId, vo);
+        return commonResult.getData();
+    }
+    /**
+     * 创建对象类型-批量新增
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param voList 对象类型对象数组
+     * @return 对象类型对象数组
+     */
+    public static List<ObjectTypeDefine> createBatch(String groupCode, String projectId, String appId, String userId, List<ObjectTypeDefine> voList) {
+        CommonResult<List<ObjectTypeDefine>> commonResult = client.createBatch(groupCode, projectId, appId, userId, voList);
+        return commonResult.getData();
+    }
+    /**
+     * 更新对象类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param vo 对象类型对象
+     * @return 对象类型对象
+     */
+    public static ObjectTypeDefine update(String groupCode, String projectId, String appId, String userId, ObjectTypeDefine vo) {
+        CommonResult<ObjectTypeDefine> commonResult = client.update(groupCode, projectId, appId, userId, vo);
+        return commonResult.getData();
+    }
+    /**
+     * 更新对象类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param voList 对象类型对象数组
+     * @return 对象类型对象数组
+     */
+    public static List<ObjectTypeDefine> updateBatch(String groupCode, String projectId, String appId, String userId, List<ObjectTypeDefine> voList) {
+        CommonResult<List<ObjectTypeDefine>> commonResult = client.updateBatch(groupCode, projectId, appId, userId, voList);
+        return commonResult.getData();
+    }
+    /**
+     * 删除对象类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param id 对象类型对象id
+     * @return 对象类型对象
+     */
+    public static void delete(String groupCode, String projectId, String appId, String userId, String id) {
+        client.delete(groupCode, projectId, appId, userId, id);
+    }
+    /**
+     * 删除对象类型-批量删除
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param ids 对象类型对象id数组
+     * @return 对象类型对象数组
+     */
+    public static void deleteBatch(String groupCode, String projectId, String appId, String userId, List<String> ids) {
+        client.deleteBatch(groupCode, projectId, appId, userId, ids);
+    }
 }

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalGraphDefineClient.java

@@ -0,0 +1,84 @@
+package com.persagy.dmp.define.client;
+
+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.define.entity.GraphDefine;
+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;
+
+/**
+ * 图类型Client
+ * @author Charlie Yu
+ * @date 2021-05-15
+ */
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,
+        url = "${persagy.bdtp.rwd.service:}",path = "/rwd/def/graph")
+public interface DigitalGraphDefineClient {
+
+    /**
+     * 查询图类型
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param criteria: 查询条件
+     * @return 图类型数组
+     */
+    @PostMapping("query")
+    CommonResult<List<GraphDefine>> 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 vo: 新增图类型对象
+     * @return 图类型对象
+     */
+    @PostMapping("create")
+    CommonResult<GraphDefine> create(@RequestParam("groupCode") String groupCode,
+                                             @RequestParam("projectId") String projectId,
+                                             @RequestParam("appId") String appId,
+                                             @RequestParam("userId") String userId,
+                                             @RequestBody GraphDefine vo);
+    /**
+     * 更新图类型对象-单个更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param vo: 更新图类型对象
+     * @return 图类型对象
+     */
+    @PostMapping("update")
+    CommonResult<GraphDefine> update(@RequestParam("groupCode") String groupCode,
+                                             @RequestParam("projectId") String projectId,
+                                             @RequestParam("appId") String appId,
+                                             @RequestParam("userId") String userId,
+                                             @RequestBody GraphDefine vo);
+    /**
+     * 删除图类型-单个删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param id: 图类型id
+     * @return void
+     */
+    @PostMapping("delete")
+    CommonResult<GraphDefine> delete(@RequestParam("groupCode") String groupCode,
+                              @RequestParam("projectId") String projectId,
+                              @RequestParam("appId") String appId,
+                              @RequestParam("userId") String userId,
+                              @RequestBody String id);
+
+}

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalGraphDefineFacade.java

@@ -0,0 +1,84 @@
+package com.persagy.dmp.define.client;
+
+import cn.hutool.extra.spring.SpringUtil;
+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.define.entity.GraphDefine;
+
+import java.util.List;
+
+/**
+ * 图类型Client门面
+ * @author Charlie Yu
+ * @date 2021-05-15
+ */
+public class DigitalGraphDefineFacade {
+
+    private static DigitalGraphDefineClient client = SpringUtil.getBean(DigitalGraphDefineClient.class);
+
+    /**
+     * 查询图类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param criteria 查询条件
+     * @return 图类型对象集合
+     */
+    public static List<GraphDefine> query(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
+        CommonResult<List<GraphDefine>> result = client.query(groupCode, projectId, appId, userId, criteria);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 查询图类型-原样返回结果
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param criteria 查询条件
+     * @return 图类型对象集合
+     */
+    public static CommonResult<List<GraphDefine>> queryPrototype(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
+        return client.query(groupCode, projectId, appId, userId, criteria);
+    }
+    /**
+     * 创建图类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param vo 图类型对象
+     * @return 图类型对象
+     */
+    public static GraphDefine create(String groupCode, String projectId, String appId, String userId, GraphDefine vo) {
+        CommonResult<GraphDefine> commonResult = client.create(groupCode, projectId, appId, userId, vo);
+        return commonResult.getData();
+    }
+    /**
+     * 更新图类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param vo 图类型对象
+     * @return 图类型对象
+     */
+    public static GraphDefine update(String groupCode, String projectId, String appId, String userId, GraphDefine vo) {
+        CommonResult<GraphDefine> commonResult = client.update(groupCode, projectId, appId, userId, vo);
+        return commonResult.getData();
+    }
+    /**
+     * 删除图类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param id 图类型对象id
+     * @return 图类型对象
+     */
+    public static GraphDefine delete(String groupCode, String projectId, String appId, String userId, String id) {
+        CommonResult<GraphDefine> commonResult = client.delete(groupCode, projectId, appId, userId, id);
+        return commonResult.getData();
+    }
+}

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalObjectInfoClient.java

@@ -0,0 +1,130 @@
+package com.persagy.dmp.define.client;
+
+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.define.entity.GraphDefine;
+import com.persagy.dmp.define.entity.ObjectInfoDefine;
+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;
+
+/**
+ * 对象信息点Client
+ * @author Charlie Yu
+ * @date 2021-05-15
+ */
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,
+        url = "${persagy.bdtp.rwd.service:}",path = "/rwd/def/funcid")
+public interface DigitalObjectInfoClient {
+
+    /**
+     * 查询对象信息点
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param criteria: 查询条件
+     * @return 对象信息点数组
+     */
+    @PostMapping("")
+    CommonResult<List<ObjectInfoDefine>> 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 vo: 新增对象信息点对象
+     * @return 对象信息点对象
+     */
+    @PostMapping("create")
+    CommonResult<ObjectInfoDefine> create(@RequestParam("groupCode") String groupCode,
+                                     @RequestParam("projectId") String projectId,
+                                     @RequestParam("appId") String appId,
+                                     @RequestParam("userId") String userId,
+                                     @RequestBody ObjectInfoDefine vo);
+    /**
+     * 新增对象信息点对象-批量新增
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param voList: 新增对象信息点对象数组
+     * @return 对象信息点对象数组
+     */
+    @PostMapping("createBatch")
+    CommonResult<List<ObjectInfoDefine>> createBatch(@RequestParam("groupCode") String groupCode,
+                                     @RequestParam("projectId") String projectId,
+                                     @RequestParam("appId") String appId,
+                                     @RequestParam("userId") String userId,
+                                     @RequestBody List<ObjectInfoDefine> voList);
+    /**
+     * 更新对象信息点对象-单个更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param vo: 更新对象信息点对象
+     * @return 对象信息点对象
+     */
+    @PostMapping("update")
+    CommonResult<ObjectInfoDefine> update(@RequestParam("groupCode") String groupCode,
+                                     @RequestParam("projectId") String projectId,
+                                     @RequestParam("appId") String appId,
+                                     @RequestParam("userId") String userId,
+                                     @RequestBody ObjectInfoDefine vo);
+    /**
+     * 更新对象信息点对象-批量更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param voList: 更新对象信息点对象数组
+     * @return 对象信息点对象数组
+     */
+    @PostMapping("updateBatch")
+    CommonResult<List<ObjectInfoDefine>> updateBatch(@RequestParam("groupCode") String groupCode,
+                                     @RequestParam("projectId") String projectId,
+                                     @RequestParam("appId") String appId,
+                                     @RequestParam("userId") String userId,
+                                     @RequestBody List<ObjectInfoDefine> voList);
+    /**
+     * 删除对象信息点-单个删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param id: 对象信息点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 String id);
+    /**
+     * 删除对象信息点-批量删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param ids: 对象信息点id数组
+     * @return void
+     */
+    @PostMapping("deleteBatch")
+    CommonResult<Void> deleteBatch(@RequestParam("groupCode") String groupCode,
+                                     @RequestParam("projectId") String projectId,
+                                     @RequestParam("appId") String appId,
+                                     @RequestParam("userId") String userId,
+                                     @RequestBody List<String> ids);
+
+}

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalObjectInfoFacade.java

@@ -0,0 +1,122 @@
+package com.persagy.dmp.define.client;
+
+import cn.hutool.extra.spring.SpringUtil;
+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.define.entity.ObjectInfoDefine;
+import com.persagy.dmp.define.entity.RelationDefine;
+
+import java.util.List;
+
+/**
+ * 对象信息点Client门面
+ * @author Charlie Yu
+ * @date 2021-05-15
+ */
+public class DigitalObjectInfoFacade {
+
+    private static DigitalObjectInfoClient client = SpringUtil.getBean(DigitalObjectInfoClient.class);
+
+    /**
+     * 查询对象信息点
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param criteria 查询条件
+     * @return 对象信息点对象集合
+     */
+    public static List<ObjectInfoDefine> query(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
+        CommonResult<List<ObjectInfoDefine>> result = client.query(groupCode, projectId, appId, userId, criteria);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 查询对象信息点-原样返回结果
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param criteria 查询条件
+     * @return 对象信息点对象集合
+     */
+    public static CommonResult<List<ObjectInfoDefine>> queryPrototype(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
+        return client.query(groupCode, projectId, appId, userId, criteria);
+    }
+    /**
+     * 创建对象信息点
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param vo 对象信息点对象
+     * @return 对象信息点对象
+     */
+    public static ObjectInfoDefine create(String groupCode, String projectId, String appId, String userId, ObjectInfoDefine vo) {
+        CommonResult<ObjectInfoDefine> commonResult = client.create(groupCode, projectId, appId, userId, vo);
+        return commonResult.getData();
+    }
+    /**
+     * 创建对象信息点-批量新增
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param voList 对象信息点对象数组
+     * @return 对象信息点对象数组
+     */
+    public static List<ObjectInfoDefine> createBatch(String groupCode, String projectId, String appId, String userId, List<ObjectInfoDefine> voList) {
+        CommonResult<List<ObjectInfoDefine>> commonResult = client.createBatch(groupCode, projectId, appId, userId, voList);
+        return commonResult.getData();
+    }
+    /**
+     * 更新对象信息点
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param vo 对象信息点对象
+     * @return 对象信息点对象
+     */
+    public static ObjectInfoDefine update(String groupCode, String projectId, String appId, String userId, ObjectInfoDefine vo) {
+        CommonResult<ObjectInfoDefine> commonResult = client.update(groupCode, projectId, appId, userId, vo);
+        return commonResult.getData();
+    }
+    /**
+     * 更新对象信息点
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param voList 对象信息点对象数组
+     * @return 对象信息点对象数组
+     */
+    public static List<ObjectInfoDefine> updateBatch(String groupCode, String projectId, String appId, String userId, List<ObjectInfoDefine> voList) {
+        CommonResult<List<ObjectInfoDefine>> commonResult = client.updateBatch(groupCode, projectId, appId, userId, voList);
+        return commonResult.getData();
+    }
+    /**
+     * 删除对象信息点
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param id 对象信息点对象id
+     * @return 对象信息点对象
+     */
+    public static void delete(String groupCode, String projectId, String appId, String userId, String id) {
+        client.delete(groupCode, projectId, appId, userId, id);
+    }
+    /**
+     * 删除对象信息点-批量删除
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param ids 对象信息点对象id数组
+     * @return 对象信息点对象数组
+     */
+    public static void deleteBatch(String groupCode, String projectId, String appId, String userId, List<String> ids) {
+        client.deleteBatch(groupCode, projectId, appId, userId, ids);
+    }
+}

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalRelationDefineClient.java

@@ -0,0 +1,85 @@
+package com.persagy.dmp.define.client;
+
+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.define.entity.GraphDefine;
+import com.persagy.dmp.define.entity.RelationDefine;
+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;
+
+/**
+ * 边类型Client
+ * @author Charlie Yu
+ * @date 2021-05-15
+ */
+@FeignClient(name = "dmp-rwd", configuration = DigitalFeignConfig.class,
+        url = "${persagy.bdtp.rwd.service:}",path = "/rwd/def/rel")
+public interface DigitalRelationDefineClient {
+
+    /**
+     * 查询边类型
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param criteria: 查询条件
+     * @return 边类型数组
+     */
+    @PostMapping("query")
+    CommonResult<List<RelationDefine>> 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 vo: 新增边类型对象
+     * @return 边类型对象
+     */
+    @PostMapping("create")
+    CommonResult<RelationDefine> create(@RequestParam("groupCode") String groupCode,
+                                     @RequestParam("projectId") String projectId,
+                                     @RequestParam("appId") String appId,
+                                     @RequestParam("userId") String userId,
+                                     @RequestBody RelationDefine vo);
+    /**
+     * 更新边类型对象-单个更新
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param vo: 更新边类型对象
+     * @return 边类型对象
+     */
+    @PostMapping("update")
+    CommonResult<RelationDefine> update(@RequestParam("groupCode") String groupCode,
+                                     @RequestParam("projectId") String projectId,
+                                     @RequestParam("appId") String appId,
+                                     @RequestParam("userId") String userId,
+                                     @RequestBody RelationDefine vo);
+    /**
+     * 删除边类型-单个删除
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param id: 边类型id
+     * @return void
+     */
+    @PostMapping("delete")
+    CommonResult<RelationDefine> delete(@RequestParam("groupCode") String groupCode,
+                                     @RequestParam("projectId") String projectId,
+                                     @RequestParam("appId") String appId,
+                                     @RequestParam("userId") String userId,
+                                     @RequestBody String id);
+
+}

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/client/DigitalRelationDefineFacade.java

@@ -0,0 +1,85 @@
+package com.persagy.dmp.define.client;
+
+import cn.hutool.extra.spring.SpringUtil;
+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.define.entity.GraphDefine;
+import com.persagy.dmp.define.entity.RelationDefine;
+
+import java.util.List;
+
+/**
+ * 边类型Client门面
+ * @author Charlie Yu
+ * @date 2021-05-15
+ */
+public class DigitalRelationDefineFacade {
+
+    private static DigitalRelationDefineClient client = SpringUtil.getBean(DigitalRelationDefineClient.class);
+
+    /**
+     * 查询边类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param criteria 查询条件
+     * @return 边类型对象集合
+     */
+    public static List<RelationDefine> query(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
+        CommonResult<List<RelationDefine>> result = client.query(groupCode, projectId, appId, userId, criteria);
+        return ResultHelper.getContent(result);
+    }
+    /**
+     * 查询边类型-原样返回结果
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param criteria 查询条件
+     * @return 边类型对象集合
+     */
+    public static CommonResult<List<RelationDefine>> queryPrototype(String groupCode, String projectId, String appId, String userId, QueryCriteria criteria) {
+        return client.query(groupCode, projectId, appId, userId, criteria);
+    }
+    /**
+     * 创建边类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param vo 边类型对象
+     * @return 边类型对象
+     */
+    public static RelationDefine create(String groupCode, String projectId, String appId, String userId, RelationDefine vo) {
+        CommonResult<RelationDefine> commonResult = client.create(groupCode, projectId, appId, userId, vo);
+        return commonResult.getData();
+    }
+    /**
+     * 更新边类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param vo 边类型对象
+     * @return 边类型对象
+     */
+    public static RelationDefine update(String groupCode, String projectId, String appId, String userId, RelationDefine vo) {
+        CommonResult<RelationDefine> commonResult = client.update(groupCode, projectId, appId, userId, vo);
+        return commonResult.getData();
+    }
+    /**
+     * 删除边类型
+     * @param groupCode 集团编码
+     * @param projectId 项目ID
+     * @param appId 应用ID
+     * @param userId 用户ID
+     * @param id 边类型对象id
+     * @return 边类型对象
+     */
+    public static RelationDefine delete(String groupCode, String projectId, String appId, String userId, String id) {
+        CommonResult<RelationDefine> commonResult = client.delete(groupCode, projectId, appId, userId, id);
+        return commonResult.getData();
+    }
+}

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjectSimpleClient.java

@@ -1,6 +1,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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,4 +33,17 @@ public interface DigitalObjectSimpleClient {
                                                                             @RequestParam("appId") String appId,
                                                                             @RequestParam("userId") String userId,
                                                                             @RequestBody(required = false) List<String> projectIds);
+    /**
+     * 根据对象信息点统计数量
+     * @param groupCode: 集团编码
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param requestData: 请求参数
+     * @return
+     */
+    @PostMapping("report/equipment/queryObjectCountByObjInfos")
+    CommonResult<List<Map<String, Object>>> queryObjectCountByObjInfos(@RequestParam("groupCode") String groupCode,
+                                                                       @RequestParam("appId") String appId,
+                                                                       @RequestParam("userId") String userId,
+                                                                       @RequestBody RequestData requestData);
 }