소스 검색

修改兼容旧的中台时的bug

lijie 3 년 전
부모
커밋
3dac5a3fd0

+ 6 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java

@@ -3,6 +3,7 @@ package com.persagy.dmp.rwd.define.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.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.CommonConstant;
@@ -41,6 +42,11 @@ public class ObjectInfoController {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
+        // 2021年8月18日20:06:24 兼容旧的查询
+        ObjectNode objCriteria = criteria.getCriteria();
+        if (null!=objCriteria && objCriteria.size()>0){
+            objCriteria.remove(CommonConstant.TYPE);
+        }
         QueryWrapper<ObjectInfoDefine> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
         ConditionUtil.ensureProjectCriteria(wrapper);

+ 1 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectTypeController.java

@@ -38,8 +38,6 @@ public class ObjectTypeController {
     @Autowired
     private IObjectTypeService service;
 
-    private final static String TYPE = "type";
-
     @PostMapping("")
     public CommonResult<List<ObjectTypeDefine>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
@@ -48,7 +46,7 @@ public class ObjectTypeController {
         // 2021年8月18日20:06:24 兼容旧的查询
         ObjectNode objCriteria = criteria.getCriteria();
         if (null!=objCriteria && objCriteria.size()>0){
-            objCriteria.remove(TYPE);
+            objCriteria.remove(CommonConstant.TYPE);
         }
         QueryWrapper<ObjectTypeDefine> wrapper = new QueryWrapper<>();
         // 添加所属项目条件

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

@@ -56,12 +56,10 @@ public class RelChainCalculateServiceImpl implements CalculateService {
             queryWrapper.eq(ObjectRelation::getProjectId,calculatingDTO.getProjectId());
         }
         objectRelationService.remove(queryWrapper);
-
-
+        // 2.根据链的关系计算,链的首尾
         List<RelationCalDTO> chain = calRule.getDependentRelChain();
 
 
-        // 2.根据链的关系计算,链的首尾
 
 
 

+ 2 - 0
dmp-common/src/main/java/com/persagy/dmp/common/constant/CommonConstant.java

@@ -31,4 +31,6 @@ public interface CommonConstant {
     String DEFAULT_GRAPH_ID_FORMAT = "Gt{}001";
     /** 默认的关系唯一识别key */
     CharSequence RELATION_UNIQUE_KEY_FORMAT = "{}_{}_{}_{}";
+    /** 新中台已移除的旧中台数据表字段 */
+    String TYPE = "type";;
 }

+ 71 - 1
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/client/DigitalObjectFacade.java

@@ -39,6 +39,20 @@ public class DigitalObjectFacade {
         return ResultHelper.getContent(result);
     }
     /**
+     * 根据项目id批量查询项目信息
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param projectIds: 项目id数组
+     * @return 原样返回结果
+     */
+    public static CommonResult<List<ObjectDigital>> batchQueryProjectByIdsPrototype(String groupCode, String projectId, String appId,
+                                                             String userId, Set<String> projectIds) {
+        return client.batchQueryProjectByIds(groupCode, projectId, appId,
+                userId, projectIds);
+    }
+    /**
      * 根据管理分区id批量查询项目信息
      * @param groupCode: 集团编码
      * @param projectId: 项目ID
@@ -54,6 +68,20 @@ public class DigitalObjectFacade {
         return ResultHelper.getContent(result);
     }
     /**
+     * 根据管理分区id批量查询项目信息
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param requestData: 请求参数
+     * @return 原样返回结果
+     */
+    public static CommonResult<List<ObjectDigital>> batchQueryProjectByGroupManageZoneIdsPrototype(String groupCode, String projectId, String appId,
+                                                             String userId, RequestData requestData) {
+        return client.batchQueryProjectByGroupManageZoneIds(groupCode, projectId, appId,
+                userId, requestData);
+    }
+    /**
      * 查询物理世界对象
      * @param groupCode: 集团编码
      * @param projectId: 项目ID
@@ -63,11 +91,24 @@ public class DigitalObjectFacade {
      * @return 对象数组
      */
     public static List<ObjectNode> query(String groupCode, String projectId, String appId,
-                                                             String userId, QueryCriteria criteria) {
+                                         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 criteria: 请求参数
+     * @return 原样查询结果
+     */
+    public static CommonResult<List<ObjectNode>> queryPrototype(String groupCode, String projectId, String appId,
+                                                       String userId, QueryCriteria criteria) {
+        return client.query(groupCode, projectId, appId, userId, criteria);
+    }
+    /**
      * 新增物理世界对象-单个新增
      * @param groupCode: 集团编码
      * @param projectId: 项目ID
@@ -163,6 +204,18 @@ public class DigitalObjectFacade {
         return commonResult.getData();
     }
     /**
+     * 根据上级id查询下级关联对象
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param requestData: 请求参数
+     * @return void
+     */
+    public static CommonResult<List<ObjectDigital>> queryObjectListSuperiorIdPrototype(String groupCode, String projectId, String appId, String userId, RequestData requestData) {
+        return client.queryObjectListSuperiorId(groupCode, projectId, appId, userId, requestData);
+    }
+    /**
      * 根据图类型编码及关系类型编码查询对象及其关联对象
      * @param groupCode: 集团编码
      * @param projectId: 项目ID
@@ -180,4 +233,21 @@ public class DigitalObjectFacade {
                 projectId, appId, userId, requestData);
         return commonResult.getData();
     }
+    /**
+     * 根据图类型编码及关系类型编码查询对象及其关联对象
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param requestData: 请求参数
+     * @return void
+     */
+    public static CommonResult<List<ObjectDigital>> queryObjectListByGraphCodeAndRelCodePrototype(String groupCode,
+                                                                           String projectId,
+                                                                           String appId,
+                                                                           String userId,
+                                                                           RequestData requestData) {
+        return client.queryObjectListByGraphCodeAndRelCode(groupCode,
+                projectId, appId, userId, requestData);
+    }
 }

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

@@ -33,6 +33,19 @@ public class DigitalRelationFacade {
         return ResultHelper.getContent(result);
     }
     /**
+     * 查询物理世界对象关系
+     * @param groupCode: 集团编码
+     * @param projectId: 项目ID
+     * @param appId: 应用ID
+     * @param userId: 用户ID
+     * @param criteria: 请求参数
+     * @return 原样查询结果
+     */
+    public static CommonResult<List<ObjectRelation>> queryPrototype(String groupCode, String projectId, String appId,
+                                             String userId, QueryCriteria criteria) {
+        return client.query(groupCode, projectId, appId, userId, criteria);
+    }
+    /**
      * 新增物理世界对象关系-单个新增
      * @param groupCode: 集团编码
      * @param projectId: 项目ID