zero 1 year ago
parent
commit
e6f7f210c4

+ 1 - 1
src/main/java/cn/cslg/pas/controller/outApi/PatentStarController.java

@@ -153,7 +153,7 @@ public class PatentStarController {
     @GetMapping("/getLegalStatus")
     @Operation(summary = "外部获取法律状态")
     public Response getLegalStatus(String appNo) throws IOException {
-        List<ExternalLegalStatusDTO> statusDTOS = patentStarApiService.getLegalStatus(appNo);
+        List<String> statusDTOS = patentStarApiService.getLegalStatus(appNo);
         return Response.success(statusDTOS);
     }
 }

+ 8 - 4
src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -54,6 +54,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 调用外部接口的Service类 PCS:权限系统
@@ -1151,12 +1152,15 @@ public class PatentStarApiService {
         return this.getPictureApi(appNo);
     }
 
-    public List<ExternalLegalStatusDTO> getLegalStatus(String appNo) {
-        List<ExternalLegalStatusDTO> dtos = new ArrayList<>();
+    public List<String> getLegalStatus(String appNo) {
+        List<String> list = new ArrayList<>();
         String cnLegalApi = this.getCnLegalApi(appNo);
         if (StringUtils.isNotEmpty(cnLegalApi)) {
-            dtos = JSONArray.parseArray(cnLegalApi, ExternalLegalStatusDTO.class);
+            List<ExternalLegalStatusDTO> statusDTOS = JSONArray.parseArray(cnLegalApi, ExternalLegalStatusDTO.class);
+            if (CollectionUtils.isEmpty(statusDTOS)) {
+                list = statusDTOS.stream().map(ExternalLegalStatusDTO::getLegalStatus).collect(Collectors.toList());
+            }
         }
-        return dtos;
+        return list;
     }
 }

+ 1 - 1
src/main/resources/jsons/patent.json

@@ -846,7 +846,7 @@
   },
   {
     "name": "法律状态",
-    "type": "String",
+    "type": "Array",
     "value": "legalStatus",
     "field": "LG",
     "esField": "legal_status.raw",