From fb8d81bf7ccb004ab61ffa5023e66940fc829183 Mon Sep 17 00:00:00 2001 From: xudawei Date: Mon, 10 Feb 2025 14:47:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3300)=20=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85-=E5=8A=A0=E4=B8=8A=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B:=E5=8C=BA=E5=9F=9F/=E4=B8=93=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/request/VisaChangeTempCreateReq.java | 35 ++-------- .../api/response/VisaDetailByIdResponse.java | 10 +++ .../visa/server/domain/ChangeRecord.java | 33 ++-------- .../visa/server/rpc/DataObjectApiGateway.java | 37 +++++++++-- .../service/impl/ChangeRecordServiceImpl.java | 64 ++----------------- 5 files changed, 55 insertions(+), 124 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java index 210ae2d3..6d62f980 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java @@ -73,26 +73,10 @@ public class VisaChangeTempCreateReq { /** * 区域集合 * 示例： - * 
+     *  
      * [
-     *     {
-     *         "areaId": 249556,
-     *         "childrenAreaList": [
-     *             {
-     *                 "areaId": 249739,
-     *                 "childrenAreaList": []
-     *             }
-     *         ]
-     *     },
-     *     {
-     *         "areaId": 249556,
-     *         "childrenAreaList": [
-     *             {
-     *                 "areaId": 249739,
-     *                 "childrenAreaList": []
-     *             }
-     *         ]
-     *     }
+     *     {"areaId": 249556},
+     *     {"areaId": 249555}
      * ]
      *  

      */
@@ -109,17 +93,8 @@ public class VisaChangeTempCreateReq {
      * 示例：
      * 
      * [
-     *     {
-     *         "id": 9658,
-     *         "code": "JIANZHU_CUOSHIBIAO",
-     *         "children": [
-     *             {
-     *                 "id": 9659,
-     *                 "code": "JIANZHU_CUOSHIBIAOSHINEIWAIZHUANGXIUGOUZAOZUOFABIAO",
-     *                 "children": []
-     *             }
-     *         ]
-     *     }
+     *     {"code":"code1"},
+     *     {"code":"code2"},
      * ]
      * 

      */
diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java
index 11fed6b8..bbed8c2d 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java
@@ -191,6 +191,16 @@ public class VisaDetailByIdResponse {
      */
     private VisaStatusEnum status;
 
+    /**
+     * 最终审批ID
+     */
+    private String approvalId;
+
+    /**
+     * 最终审批状态
+     */
+    private String approvalStatus;
+
     @Data
     @Builder
     @NoArgsConstructor
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java
index 7628c57f..4004977d 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java
@@ -61,24 +61,8 @@ public class ChangeRecord extends BaseEntity {
      * 示例：
      *  
      * [
-     *     {
-     *         "areaId": 249556,
-     *         "childrenAreaList": [
-     *             {
-     *                 "areaId": 249739,
-     *                 "childrenAreaList": []
-     *             }
-     *         ]
-     *     },
-     *     {
-     *         "areaId": 249556,
-     *         "childrenAreaList": [
-     *             {
-     *                 "areaId": 249739,
-     *                 "childrenAreaList": []
-     *             }
-     *         ]
-     *     }
+     *     {"areaId": 249556},
+     *     {"areaId": 249555}
      * ]
      *  

      */
@@ -90,17 +74,8 @@ public class ChangeRecord extends BaseEntity {
      * 示例：
      * 
      * [
-     *     {
-     *         "id": 9658,
-     *         "code": "JIANZHU_CUOSHIBIAO",
-     *         "children": [
-     *             {
-     *                 "id": 9659,
-     *                 "code": "JIANZHU_CUOSHIBIAOSHINEIWAIZHUANGXIUGOUZAOZUOFABIAO",
-     *                 "children": []
-     *             }
-     *         ]
-     *     }
+     *     {"code":"code1"},
+     *     {"code":"code2"},
      * ]
      * 

      */
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java
index 3e9ff8ed..6b183872 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java
@@ -1,10 +1,10 @@
 package cn.axzo.nanopart.visa.server.rpc;
 
-import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.karma.client.feign.tyr.DataObjectApi;
 import cn.axzo.karma.client.feign.tyr.request.MatchDataObjectReq;
 import cn.axzo.karma.client.feign.tyr.response.MatchDataObjectResp;
-import com.alibaba.fastjson.JSON;
+import cn.axzo.karma.client.feign.tyr.response.MergeMatchDataResp;
+import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -27,14 +27,39 @@ public class DataObjectApiGateway {
          return MatchDataObjectResp.builder().build();
         }
         try {
-            log.info("DataObjectApiGateway match, params:{}", JSON.toJSONString(req));
-            ApiResult match = dataObjectApi.match(req);
-            log.info("DataObjectApiGateway match, result:{}", JSON.toJSONString(match));
-            return match.getData();
+//            log.info("DataObjectApiGateway match, params:{}", JSON.toJSONString(req));
+//            ApiResult match = dataObjectApi.match(req);
+//            log.info("DataObjectApiGateway match, result:{}", JSON.toJSONString(match));
+//            return match.getData();
+            return mockDataObject();
         } catch (Exception e) {
             log.warn("DataObjectApiGateway match exception", e);
             throw e;
         }
     }
 
+    /**
+     * mock数据
+     */
+    private MatchDataObjectResp mockDataObject() {
+        MergeMatchDataResp.DataItem dt1 = MergeMatchDataResp.DataItem.builder()
+                .personIds(Lists.newArrayList(9000398292L,89511L))
+                .ouId(6122L)
+                .workspaceId(399L)
+                .nodeId(10345L)
+                .projectIds(Lists.newArrayList(424L))
+                .build();
+
+        MergeMatchDataResp.DataItem dt2 = MergeMatchDataResp.DataItem.builder()
+                .personIds(Lists.newArrayList(9000506L,89636L))
+                .ouId(6158L)
+                .workspaceId(399L)
+                .nodeId(10345L)
+                .projectIds(Lists.newArrayList(763L))
+                .build();
+
+        MergeMatchDataResp matchDataResp = MergeMatchDataResp.builder().dataItems(Lists.newArrayList(dt1, dt2)).build();
+        return MatchDataObjectResp.builder().mergedDataObject(matchDataResp).build();
+    }
+
 }
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
index 0940df41..2e2b80a3 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
@@ -1,6 +1,5 @@
 package cn.axzo.nanopart.visa.server.service.impl;
 
-import cn.axzo.apollo.api.res.ConstructionAreaInfo;
 import cn.axzo.apollo.workspace.api.workspace.res.GetDetailRes;
 import cn.axzo.apollo.workspace.api.workspace.res.ProjectBriefResp;
 import cn.axzo.apollo.workspace.api.workspace.res.ProjectDetailRes;
@@ -80,7 +79,6 @@ import cn.axzo.nanopart.visa.server.utils.Constants;
 import cn.axzo.orggateway.api.nodeuser.dto.OrgNodeUserDTO;
 import cn.axzo.orggateway.api.nodeuser.req.ListOrgNodeUserReq;
 import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
-import cn.axzo.thor.client.model.DrawingMajorResp;
 import cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum;
 import cn.axzo.workflow.common.model.dto.UploadFieldDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO;
@@ -91,7 +89,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Pair;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -385,10 +382,12 @@ public class ChangeRecordServiceImpl extends ServiceImpl buildArea(JSONArray relationArea) {
-        if (CollectionUtils.isEmpty(relationArea)) {
-            return Lists.newArrayList();
-        }
-        List relationAreaList = relationArea.toJavaList(VisaDetailByIdResponse.RelationArea.class);
-        if (CollectionUtils.isEmpty(relationAreaList)) {
-            return Lists.newArrayList();
-        }
-        List areaIds = relationAreaList.stream()
-                .filter(item -> Objects.nonNull(item.getId()))
-                .map(VisaDetailByIdResponse.RelationArea::getId).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(areaIds)) {
-            return Lists.newArrayList();
-        }
-        List list = apolloConstructionAreaGateway.getAllConstructionAreaByIds(areaIds);
-        if (CollectionUtils.isEmpty(list)) {
-            return Lists.newArrayList();
-        }
-        return list.stream().map(item -> VisaDetailByIdResponse.RelationAreaDetail.builder()
-                        .id(item.getId())
-                        .name(item.getName()).build())
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * 构建专业集合
-     */
-    private List buildProfession(Long projectId, JSONArray relationProfessional) {
-
-        if (Objects.isNull(projectId) || CollectionUtils.isEmpty(relationProfessional)) {
-            return Lists.newArrayList();
-        }
-        List professionalList = relationProfessional.toJavaList(VisaDetailByIdResponse.RelationProfessional.class);
-
-        if (CollectionUtils.isEmpty(professionalList)) {
-            return Lists.newArrayList();
-        }
-        Set majorCodes = professionalList.stream()
-                .filter(item -> StringUtils.hasText(item.getCode()))
-                .map(VisaDetailByIdResponse.RelationProfessional::getCode).collect(Collectors.toSet());
-        if (CollectionUtils.isEmpty(majorCodes)) {
-            return Lists.newArrayList();
-        }
-
-        List majorRespList = drawingMajorGateway.list(projectId, majorCodes, true);
-        if (CollectionUtils.isEmpty(majorCodes)) {
-            return Lists.newArrayList();
-        }
-        return majorRespList.stream()
-                .map(item -> VisaDetailByIdResponse.RelationProfessionalDetail.builder().id(item.getId()).code(item.getCode()).name(item.getName()).build())
-                .collect(Collectors.toList());
-    }
-
     /**
      * 通过变更签证Id获取Entity
      *