20240929 添加查新对比记录

src/main/java/cn/cslg/pas/common/dto/RetrieveRecordDTO.java

@@ -28,4 +28,5 @@ public class RetrieveRecordDTO {
     private Date updateTime;
 
     private Integer totalNum;
+    private String searchSetting;
 }

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

@@ -102,6 +102,8 @@ public class PatentStarApiService {
                 assoRetrieveRecordProjectService.add(retrieveRecord.getId(), projectId);
             }
         } else {
+            retrieveRecord =retrieveRecordService.getById(patentStarListDTO.getRetrieveRecordId());
+            retrieveRecord.setRetrieveTime(new Date());
             retrieveRecord.updateById();
         }
         List<StarPatentVO> starPatentVOS = (List<StarPatentVO>) map.get("records");

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

@@ -133,7 +133,7 @@ public class RetrieveRecordService extends ServiceImpl<RetrieveRecordMapper, Ret
         RetrieveRecord retrieveRecord = new RetrieveRecord();
         retrieveRecord.setConditions(patentStarListDTO.getCurrentQuery());
         Integer id = patentStarListDTO.getRetrieveRecordId();
-
+        retrieveRecord.setSearchSetting(patentStarListDTO.getSearchSetting());
 
         if (id != null) {
             retrieveRecord = this.getById(id);
@@ -154,4 +154,5 @@ public class RetrieveRecordService extends ServiceImpl<RetrieveRecordMapper, Ret
 
         return retrieveRecord;
     }
+
 }

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

@@ -53,8 +53,7 @@ public class SavePatentToEsThread extends Thread {
                     taskCondition.await();
                 }
 
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
 
             }
             if (uploadPatentWebDTOS.size() == 0) {
@@ -77,24 +76,24 @@ public class SavePatentToEsThread extends Thread {
                     patent = this.formPatent(patent, orgPatent);
 
                     //更新翻译
-                    if(patent.getClaim()!=null&&patent.getClaim()!=orgPatent.getClaim()){
-                        TranslateService translateService =applicationContext.getBean(TranslateService.class);
-                        if(orgPatent.getPatentNo()!=null) {
-                            translateService.deleteTranslatePatentNo(orgPatent.getPatentNo(),"3");
+                    if (patent.getClaim() != null && patent.getClaim() != orgPatent.getClaim()) {
+                        TranslateService translateService = applicationContext.getBean(TranslateService.class);
+                        if (orgPatent.getPatentNo() != null) {
+                            translateService.deleteTranslatePatentNo(orgPatent.getPatentNo(), "3");
                         }
                     }
 
-                    if(patent.getPublicFullText()!=null&&patent.getPublicFullText()!=orgPatent.getPublicFullText()){
-                        TranslateService translateService =applicationContext.getBean(TranslateService.class);
-                        if(orgPatent.getPatentNo()!=null) {
-                            translateService.deleteTranslatePatentNo(orgPatent.getPatentNo(),"4");
+                    if (patent.getPublicFullText() != null && patent.getPublicFullText() != orgPatent.getPublicFullText()) {
+                        TranslateService translateService = applicationContext.getBean(TranslateService.class);
+                        if (orgPatent.getPatentNo() != null) {
+                            translateService.deleteTranslatePatentNo(orgPatent.getPatentNo(), "4");
                         }
                     }
 
-                    if(patent.getGrantFullText()!=null&&patent.getGrantFullText()!=orgPatent.getGrantFullText()){
-                        TranslateService translateService =applicationContext.getBean(TranslateService.class);
-                        if(orgPatent.getPatentNo()!=null) {
-                            translateService.deleteTranslatePatentNo(orgPatent.getPatentNo(),"4");
+                    if (patent.getGrantFullText() != null && patent.getGrantFullText() != orgPatent.getGrantFullText()) {
+                        TranslateService translateService = applicationContext.getBean(TranslateService.class);
+                        if (orgPatent.getPatentNo() != null) {
+                            translateService.deleteTranslatePatentNo(orgPatent.getPatentNo(), "4");
                         }
                     }
 
@@ -135,7 +134,7 @@ public class SavePatentToEsThread extends Thread {
 
                         //添加报告对比文件
                         if (importTaskAMVO.getProjectType() != null && importTaskAMVO.getProjectType().equals(1)) {
-                            if (importTaskAMVO.getReportType().equals(7) || importTaskAMVO.getReportType().equals(1) || importTaskAMVO.getReportType().equals(2)) {
+                            if (importTaskAMVO.getReportType()==null||importTaskAMVO.getReportType().equals(7) || importTaskAMVO.getReportType().equals(1) || importTaskAMVO.getReportType().equals(2)) {
                                 CompareLiteratureService compareLiteratureService = applicationContext.getBean(CompareLiteratureService.class);
                                 compareLiteratureService.addPatentCompareLiterature(patent, importTaskAMVO.getProjectId(), importTaskAMVO.getCreateId());
                             }
@@ -168,7 +167,6 @@ public class SavePatentToEsThread extends Thread {
                 }
 
 
-
                 //保存和自定义字段关联
                 if (importTaskAMVO.getFieldDTOS() != null && importTaskAMVO.getFieldDTOS().size() > 0) {
                     for (EsCustomFieldDTO esCustomFieldDTO : importTaskAMVO.getFieldDTOS()
@@ -256,12 +254,12 @@ public class SavePatentToEsThread extends Thread {
             if (orgPatent.getClaim() != null && orgPatent.getClaim().size() > 0 && orgPatent.getGrantNo() != null && patent.getGrantNo() == null) {
                 patent.setClaim(orgPatent.getClaim());
             }
-            if(orgPatent.getGrantNo()!=null){
+            if (orgPatent.getGrantNo() != null) {
                 patent.setGrantFullText(patent.getPublicFullText());
                 patent.setPublicFullText(null);
             }
         }
-return  patent;
+        return patent;
     }
 
 

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

@@ -133,9 +133,13 @@ public class TaskThread extends Thread {
         if (importTaskAMVO.getState().equals(1)) {
             task.setState(2);
             importTaskAMVO.setState(2);
+ try {
+     this.sendEmailDoneMail(task);
+ }
 
-            this.sendEmailDoneMail(task);
-
+catch (Exception e){
+     e.printStackTrace();
+}
 
         } else {
             task.setState(importTaskAMVO.getState());

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

@@ -159,6 +159,7 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
         if (ObjectUtils.isEmpty(literature)) {
             literature = new NoveltyCompareLiterature();
             BeanUtils.copyProperties(vo, literature);
+            literature.setCompareLitertureId(compareLitertureId);
             literature.insert();
         }
         return literature.getId();

src/main/resources/application-dev.yml

@@ -71,4 +71,11 @@ FileSource: 1
 ES:
   patentVector: patent_vector
   patent: wxpatent
-  config: 192.168.2.24
+  config: 192.168.2.24
+IPEasySetting:
+  DownloadFileSavePath: F:\file
+  isHeadless: true
+  Account: zhuliu
+  Password: cCv51b
+  ChromeDriverPath: C:\Program Files\Google\Chrome\Application\chrome.exe
+  IPEasyWeb: http://47.106.94.35/index.aspx

src/test/java/cn/cslg/pas/novelty/GetReportInfoFromWDTest.java

@@ -26,7 +26,7 @@ public class GetReportInfoFromWDTest {
     private static boolean isHeadless = true;
     private static String account = "zhuliu";
     private static String password = "cCv51b";
-    private static String chromeDriverPath = "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
+    private static String chromeDriverPath = "E:\\test\\chromedriver-win64\\chromedriver-win64\\chromedriver.exe";
     private static String iPEasyWeb = "http://47.106.94.35/index.aspx";
 
     @Test
@@ -56,9 +56,9 @@ public class GetReportInfoFromWDTest {
         options.addArguments("--lang=nl");
         options.addArguments("--disable-popup-blocking");
         options.addArguments("--disable-images");
-
+        options.addArguments("--remote-allow-origins=*");
         if (isHeadless) {
-            options.addArguments("headless");
+//            options.addArguments("headless");
         }
 
         WebDriver driver = null;