From 9cea4408d7a7db294b8a9065eff6bfbd1b554b03 Mon Sep 17 00:00:00 2001
From: xudawei <xudawei@axzo.cn>
Date: Thu, 6 Feb 2025 16:53:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3300)=20FeignConfig=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8Athor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/axzo/nanopart/config/FeignConfig.java   | 3 +++
 .../cn/axzo/nanopart/visa/api/enums/VisaButtonTypeEnum.java  | 4 ++++
 .../visa/server/controller/ChangeRecordController.java       | 4 +++-
 .../visa/server/service/impl/ChangeRecordServiceImpl.java    | 5 ++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/nanopart-server/src/main/java/cn/axzo/nanopart/config/FeignConfig.java b/nanopart-server/src/main/java/cn/axzo/nanopart/config/FeignConfig.java
index dbb23e00..00336a74 100644
--- a/nanopart-server/src/main/java/cn/axzo/nanopart/config/FeignConfig.java
+++ b/nanopart-server/src/main/java/cn/axzo/nanopart/config/FeignConfig.java
@@ -69,6 +69,8 @@ public class FeignConfig implements RequestInterceptor, EnvironmentAware {
     private String dataCollectionUrl;
     @Value("${attendanceUrl:http://dev-app.axzo.cn/attendance}")
     private String attendanceApi;
+    @Value("${thorUrl:http://dev-app.axzo.cn/thor}")
+    private String thorApi;
     private static String POD_NAMESPACE;
 
     static {
@@ -107,6 +109,7 @@ public class FeignConfig implements RequestInterceptor, EnvironmentAware {
             url = url.replace("http://karma:8080", karmaEnvUrl);
             url = url.replace("http://data-collection:21200", dataCollectionUrl);
             url = url.replace("http://attendance:8080", attendanceApi);
+            url = url.replace("http://thor:8080", thorApi);
             String profile = environment.getProperty("spring.profiles.active");
             if(Objects.equals(profile, "test") && url.contains("dev-app.axzo.cn")) {
                 url = url.replace("dev-app", "test-api");
diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaButtonTypeEnum.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaButtonTypeEnum.java
index bead5a3c..d94be06f 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaButtonTypeEnum.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaButtonTypeEnum.java
@@ -117,4 +117,8 @@ public enum VisaButtonTypeEnum {
         }
     }
 
+    public static Set<VisaButtonTypeEnum> all() {
+        return Sets.newHashSet(VisaButtonTypeEnum.values());
+    }
+
 }
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
index 4cf43fde..e1383352 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
@@ -4,6 +4,7 @@ import cn.axzo.framework.domain.web.result.ApiPageResult;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.framework.domain.web.result.PageData;
 import cn.axzo.nanopart.visa.api.changerecord.ChangeRecordApi;
+import cn.axzo.nanopart.visa.api.enums.VisaButtonTypeEnum;
 import cn.axzo.nanopart.visa.api.request.ChangeRecordForbidReq;
 import cn.axzo.nanopart.visa.api.request.ChangeStatusRequest;
 import cn.axzo.nanopart.visa.api.request.FetchVisaAllConfirmReq;
@@ -74,7 +75,8 @@ public class ChangeRecordController implements ChangeRecordApi {
      */
     public ApiResult<VisaDetailByIdResponse> visaDetailById(@RequestBody @Valid VisaDetailByIdRequest req) {
         VisaDetailByIdResponse resp = changeRecordService.detailById(req.getVisaId());
-        resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus()));
+        resp.setBtnList(VisaButtonTypeEnum.all());
+//        resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus()));
         return ApiResult.ok(resp);
     }
 
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 ae8b950e..74cd0411 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
@@ -320,6 +320,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 
 
         return VisaDetailByIdResponse.builder()
+                .visaId(visaId)
                 .no(visa.getNo()) //单号
                 .type(visa.getType()) //单据类型,DESIGN_CHANGE:设计变更,TECHNOLOGY_APPROVED:技术核定,PROJECT_VISA:工程签证
                 .reason(visa.getReason()) //发生原因
@@ -355,7 +356,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         if (CollectionUtils.isEmpty(attachList)) {
             return Lists.newArrayList();
         }
-        List<String> attachContentList = attachList.stream().map(ChangeRecordRelation::getContent).collect(Collectors.toList());
+        List<String> attachContentList = attachList.stream()
+                .filter(item -> StringUtils.hasText(item.getContent()))
+                .map(ChangeRecordRelation::getContent).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(attachContentList)) {
             return Lists.newArrayList();
         }