20240929 添加查新对比记录

src/main/java/cn/cslg/pas/service/business/ImportTaskConditionService.java

@@ -104,6 +104,10 @@ public class ImportTaskConditionService extends ServiceImpl<ImportTaskConditionM
             } else if (importTaskDTO.getImportToType().equals(2)) {
                 importTaskCondition.setProductId(importTaskDTO.getImportToId());
             }
+             else if(importTaskDTO.getImportToType().equals(3)){
+                importTaskCondition.setProjectType(3);
+                importTaskCondition.setProjectId(importTaskDTO.getImportToId());
+            }
         }
         importTaskCondition.setImportContent(importTaskDTO.getImportContent());
         importTaskCondition.setCrons(importTaskDTO.getCrons());

src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -153,9 +153,9 @@ public class PatentStarApiService {
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
+                .connectTimeout(600, TimeUnit.SECONDS)
+                .writeTimeout(600, TimeUnit.SECONDS)
+                .readTimeout(600, TimeUnit.SECONDS)
                 .dns(new XDns(100000))
                 .build();
         // 创建一个RequestBody(参数1：数据类型 参数2传递的json串)

src/main/java/cn/cslg/pas/service/importPatent/SavePatentToEsThread.java

@@ -133,8 +133,8 @@ public class SavePatentToEsThread extends Thread {
                         }
 
                         //添加报告对比文件
-                        if (importTaskAMVO.getProjectType() != null && importTaskAMVO.getProjectType().equals(1)) {
-                            if (importTaskAMVO.getReportType()==null||importTaskAMVO.getReportType().equals(7) || importTaskAMVO.getReportType().equals(1) || importTaskAMVO.getReportType().equals(2)) {
+                        if (importTaskAMVO.getProjectType() != null && (importTaskAMVO.getProjectType().equals(1)||importTaskAMVO.getProjectType().equals(3))) {
+                            if (importTaskAMVO.getReportType()==null||importTaskAMVO.getReportType().equals(7) || importTaskAMVO.getReportType().equals(1) || importTaskAMVO.getReportType().equals(2)||importTaskAMVO.getProjectType().equals(3)) {
                                 CompareLiteratureService compareLiteratureService = applicationContext.getBean(CompareLiteratureService.class);
                                 compareLiteratureService.addPatentCompareLiterature(patent, importTaskAMVO.getProjectId(), importTaskAMVO.getCreateId());
                             }

src/main/java/cn/cslg/pas/service/novelty/ImportPatentQueenService.java

@@ -21,7 +21,6 @@ import java.util.Arrays;
  */
 @Service
 @RequiredArgsConstructor
-@EnableAsync
 public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMapper, ImportPatentQueen> {
     private final ImportSinglePatentService importSinglePatentService;
     private final CompareLiteratureService compareLiteratureService;
@@ -40,22 +39,24 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
     /**
      *
      */
-    @Async
     public void importPatent(ImportPatentQueen importPatentQueen) {
 //        RefreshPatentDTO refreshPatentDTO = new RefreshPatentDTO();
 //        refreshPatentDTO.setPatentNo(importPatentQueen.getPatentNo());
 //        refreshPatentDTO.setRefreshContent(Arrays.asList(2,3,4,5,6));
-        Integer projectId = importPatentQueen.getProjectId();
-        String patentNo = importPatentQueen.getPatentNo();
-        try {
-            importSinglePatentService.addSinglePatent(importPatentQueen.getPatentNo());
-            compareLiteratureService.updateByPatentNo(projectId, patentNo);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        total = total - 1;
-        this.removeById(importPatentQueen);
-        this.startImport();
+        new Thread(() -> {
+            Integer projectId = importPatentQueen.getProjectId();
+            String patentNo = importPatentQueen.getPatentNo();
+            try {
+                importSinglePatentService.addSinglePatent(importPatentQueen.getPatentNo());
+                compareLiteratureService.updateByPatentNo(projectId, patentNo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            total = total - 1;
+            this.removeById(importPatentQueen);
+            this.startImport();
+        }).start();
+
 
 
     }