20240929 添加查新对比记录

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

@@ -113,21 +113,22 @@ public class ImportSinglePatentService {
 
     public PatentWithIdVO addSinglePatent(String patentNo) {
         PatentWithIdVO patentWithIdVO = new PatentWithIdVO();
-        StarPatentVO starPatentVO = new StarPatentVO();
-        starPatentVO = this.getPatentFromWeb(patentNo);
-        if (starPatentVO == null) {
-            return null;
-        }
-        Patent patent = this.getPatentCataloguingFromWeb(starPatentVO);
 
-        PatentJoin patentJoin = new PatentJoin();
-        patentJoin.setName("patent");
-        patent.setPatentJoin(patentJoin);
         try {
-            patentWithIdVO = esService.getIdByPatentNo(patent.getPatentNo());
+            patentWithIdVO = esService.getIdByPatentNo(patentNo);
             if (patentWithIdVO != null) {
                 return patentWithIdVO;
             }
+            StarPatentVO starPatentVO = new StarPatentVO();
+            starPatentVO = this.getPatentFromWeb(patentNo);
+            if (starPatentVO == null) {
+                return null;
+            }
+            Patent patent = this.getPatentCataloguingFromWeb(starPatentVO);
+
+            PatentJoin patentJoin = new PatentJoin();
+            patentJoin.setName("patent");
+            patent.setPatentJoin(patentJoin);
             patentWithIdVO = new PatentWithIdVO();
             String patentId = esService.addPatent(patent);
             patentWithIdVO.setPatent(patent);

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

@@ -53,23 +53,24 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
                 e.printStackTrace();
             }
             total = total - 1;
-            this.removeById(importPatentQueen);
+            this.removeById(importPatentQueen.getId());
             this.startImport();
         }).start();
 
 
-
     }
 
     public void startImport() {
-        total += 1;
+
         if (total > 5) {
             return;
         }
+
         LambdaQueryWrapper<ImportPatentQueen> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ImportPatentQueen::getState, 0);
         ImportPatentQueen importPatentQueen = this.getOne(queryWrapper, false);
         if (importPatentQueen != null) {
+            total += 1;
             this.importPatent(importPatentQueen);
         }
     }

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

@@ -113,7 +113,7 @@ public class NoveltyExportReportService {
         JSONObject configObject = JSONObject.parseObject(dateSource);
         LoopRowTableRenderPolicy tableRenderPolicy = new LoopRowTableRenderPolicy();
         HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();
-        ConfigureBuilder configureBuilder = Configure.builder();
+        ConfigureBuilder configureBuilder = Configure.builder().useSpringEL();
         for (Map.Entry<String, Object> entry : configObject.entrySet()) {
             String key = entry.getKey();
             JSONObject jsonObject = configObject.getJSONObject(key);