检索接口

PAS/src/main/java/cn/cslg/pas/common/model/vo/outApi/StarPatentVO.java

@@ -59,7 +59,7 @@ public class StarPatentVO implements Serializable {
      * 陈宇 -> 公告日
      */
     @JSONField(name = "GD")
-    private String announceDate;
+    private String publicAccreditDate;
     /**
      * 公开日
      */

PAS/src/main/java/cn/cslg/pas/service/outApi/PatentStarApiService.java

@@ -11,6 +11,7 @@ import cn.cslg.pas.domain.*;
 import cn.cslg.pas.service.upLoadPatent.RetrieveRecordService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.FormBody;
@@ -46,6 +47,8 @@ public class PatentStarApiService {
     }
 
     public static String formQuery(String query) {
+       query= query.toUpperCase();
+       query ="("+query+")";
         query = query
                 .replace(" AND ", "*")
                 .replace(" OR ", "+")
@@ -124,7 +127,8 @@ public class PatentStarApiService {
     }
 
     //装载专利信息
-    public void loadStarPatentVOS(List<StarPatentVO> starPatentVOS) {
+    public void loadStarPatentVOS(List<StarPatentVO> starPatentVOS,JSONObject Data) {
+        String aa =Data.toString();
         starPatentVOS.forEach(item -> {
             //如果有公开号，则将公开号作为专利号
             if (item.getPublicNo() != null && !item.getPublicNo().equals("")) {
@@ -134,9 +138,13 @@ public class PatentStarApiService {
                 item.setPublicNo(item.getAnnounceNo());
                 item.setPatentNo(item.getAnnounceNo());
             }
+            else {
+                System.out.println("");
+
+            }
             //陈宇 ↓ 如果没有公开日就将公告日作为公开日
             if (item.getPublicDate() == null || item.getPublicDate().equals("")) {
-                item.setPublicDate(item.getAnnounceDate());
+                item.setPublicDate(item.getPublicAccreditDate());
             }
             item.setApplicant(new ArrayList<>());
             item.setAgent(new ArrayList<>());
@@ -285,7 +293,7 @@ public class PatentStarApiService {
                 }
                 JSONObject Data = (JSONObject) jsonObject.get("Data");
                 List<StarPatentVO> starPatentVOS = JSONArray.parseArray(Data.get("List").toString(), StarPatentVO.class);
-                this.loadStarPatentVOS(starPatentVOS);
+                this.loadStarPatentVOS(starPatentVOS,Data);
                 // 打印服务端返回结果
                 //  return Objects.requireNonNull(response.body()).string();
                 Map<String, Object> reMap = new HashMap<>();