2/2

PAS/src/main/java/cn/cslg/pas/service/FileManagerService.java

@@ -58,9 +58,9 @@ public class FileManagerService {
                 .addFormDataPart("sourceId", String.valueOf(FileSource))
                 .build();
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
+                .connectTimeout(6000, TimeUnit.SECONDS)
+                .writeTimeout(6000, TimeUnit.SECONDS)
+                .readTimeout(6000, TimeUnit.SECONDS)
                 .build();
         Request request = new Request.Builder()
                 .url(FMSUrl + "/fileManager/uploadSystemFile")
@@ -82,9 +82,9 @@ public class FileManagerService {
      */
     public byte[] downloadSystemFileFromFMS(Integer fieldId) throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
+                .connectTimeout(6000, TimeUnit.SECONDS)
+                .writeTimeout(6000, TimeUnit.SECONDS)
+                .readTimeout(6000, TimeUnit.SECONDS)
                 .build();
         Request request = new Request.Builder()
                 .url(FMSUrl + "/fileManager/downloadSystemFile?fileId=" + fieldId)
@@ -102,9 +102,9 @@ public class FileManagerService {
         String param = new Gson().toJson(fileIds);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
+                .connectTimeout(6000, TimeUnit.SECONDS)
+                .writeTimeout(6000, TimeUnit.SECONDS)
+                .readTimeout(6000, TimeUnit.SECONDS)
                 .build();
         Request request = new Request.Builder()
                 .url(FMSUrl + "/fileManager/getFileData")

PAS/src/main/java/cn/cslg/pas/service/PatentInstructionService.java

@@ -97,9 +97,18 @@ public class PatentInstructionService extends ServiceImpl<PatentInstructionMappe
         return pageList;
     }
 
-    public List<PatentInstruction> getPatentInstructionByPatentNo(String patentNo) {
+    public List<PatentInstruction> getPatentInstructionByPatentNo(String patentNo,String appNo,String publicNo,String grantNo) {
         LambdaQueryWrapper<PatentInstruction> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PatentInstruction::getPatentNo, patentNo);
+        if(appNo!=null){
+            queryWrapper.or().eq(PatentInstruction::getPatentNo, appNo);
+        }
+        if(publicNo!=null){
+            queryWrapper.or().eq(PatentInstruction::getPatentNo, publicNo);
+        }
+        if(grantNo!=null){
+            queryWrapper.or().eq(PatentInstruction::getPatentNo, grantNo);
+        }
         return this.list(queryWrapper);
     }
 

PAS/src/main/java/cn/cslg/pas/service/PatentService.java

@@ -853,7 +853,7 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         patentDTO.setInstruction(patentInstructionTextService.getPatentInstructionTextByPatentId(patent.getId()));
         patentDTO.setRights(patentRightService.getPatentRightByPatentId(patent.getId()));
         patentDTO.setImage(patentImageService.getPatentImageByPatentId(patent.getId()));
-        patentDTO.setPdf(patentInstructionService.getPatentInstructionByPatentNo(patent.getPatentNo()));
+        patentDTO.setPdf(patentInstructionService.getPatentInstructionByPatentNo(patent.getPatentNo(),patent.getApplicationNo(),patent.getPublicNo(),patent.getPublicAccreditNo()));
         patentDTO.setIpc(patentClassNumberLinkList.stream().filter(patentClassNumberLink -> patentClassNumberLink.getType().equals(Constants.PATENT_CLASS_NUMBER_IPC) && patentClassNumberLink.getMain().equals(1)).findFirst().orElse(new PatentClassNumberLink()).getCode());
         patentDTO.setUpc(patentClassNumberLinkList.stream().filter(patentClassNumberLink -> patentClassNumberLink.getType().equals(Constants.PATENT_CLASS_NUMBER_UPC) && patentClassNumberLink.getMain().equals(1)).findFirst().orElse(new PatentClassNumberLink()).getCode());
         patentDTO.setIpcList(patentClassNumberLinkList.stream().filter(patentClassNumber -> patentClassNumber.getType().equals(Constants.PATENT_CLASS_NUMBER_IPC)).map(PatentClassNumberLink::getCode).distinct().collect(Collectors.toList()));
@@ -965,7 +965,7 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         patentDTO.setInstruction(patentInstructionTextService.getPatentInstructionTextByPatentId(patent.getId()));
         patentDTO.setRights(patentRightService.getPatentRightByPatentId(patent.getId()));
         patentDTO.setImage(patentImageService.getPatentImageByPatentId(patent.getId()));
-        patentDTO.setPdf(patentInstructionService.getPatentInstructionByPatentNo(patent.getPatentNo()));
+        patentDTO.setPdf(patentInstructionService.getPatentInstructionByPatentNo(patent.getPatentNo(),patent.getApplicationNo(),patent.getPublicNo(),patent.getPublicAccreditNo()));
         patentDTO.setIpc(patentClassNumberLinkList.stream().filter(patentClassNumberLink -> patentClassNumberLink.getType().equals(Constants.PATENT_CLASS_NUMBER_IPC) && patentClassNumberLink.getMain().equals(1)).findFirst().orElse(new PatentClassNumberLink()).getCode());
         patentDTO.setUpc(patentClassNumberLinkList.stream().filter(patentClassNumberLink -> patentClassNumberLink.getType().equals(Constants.PATENT_CLASS_NUMBER_UPC) && patentClassNumberLink.getMain().equals(1)).findFirst().orElse(new PatentClassNumberLink()).getCode());
         patentDTO.setIpcList(patentClassNumberLinkList.stream().filter(patentClassNumber -> patentClassNumber.getType().equals(Constants.PATENT_CLASS_NUMBER_IPC)).map(PatentClassNumberLink::getCode).distinct().collect(Collectors.toList()));