20240929 添加查新对比记录

src/main/java/cn/cslg/pas/domain/business/novelty/ImportPatentQueen.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.joda.time.DateTime;
 
 import java.io.Serializable;
 
@@ -32,5 +33,6 @@ public class ImportPatentQueen extends BaseEntity<ImportPatentQueen> {
      * 
      */
     private Integer state;
-
+    @TableField(value = "create_time")
+    private DateTime createTime;
 }

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

@@ -1,6 +1,7 @@
 package cn.cslg.pas.service.novelty;
 
 import cn.cslg.pas.common.dto.es.RefreshPatentDTO;
+import cn.cslg.pas.common.vo.PatentWithIdVO;
 import cn.cslg.pas.domain.business.novelty.ImportPatentQueen;
 import cn.cslg.pas.mapper.novelty.ImportPatentQueenMapper;
 import cn.cslg.pas.service.business.CompareLiteratureService;
@@ -44,16 +45,21 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
 //        refreshPatentDTO.setPatentNo(importPatentQueen.getPatentNo());
 //        refreshPatentDTO.setRefreshContent(Arrays.asList(2,3,4,5,6));
         new Thread(() -> {
+
             Integer projectId = importPatentQueen.getProjectId();
             String patentNo = importPatentQueen.getPatentNo();
             try {
-                importSinglePatentService.addSinglePatent(importPatentQueen.getPatentNo());
-                compareLiteratureService.updateByPatentNo(projectId, patentNo);
+                PatentWithIdVO patentWithIdVO = importSinglePatentService.addSinglePatent(importPatentQueen.getPatentNo());
+                if(patentWithIdVO!=null){
+
+                    this.removeById(importPatentQueen.getId());
+                    compareLiteratureService.updateByPatentNo(projectId, patentNo);
+                }
+
             } catch (Exception e) {
                 e.printStackTrace();
             }
             total = total - 1;
-            this.removeById(importPatentQueen.getId());
             this.startImport();
         }).start();
 
@@ -67,7 +73,8 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
         }
 
         LambdaQueryWrapper<ImportPatentQueen> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ImportPatentQueen::getState, 0);
+        queryWrapper.eq(ImportPatentQueen::getState, 0)
+                .orderByAsc(ImportPatentQueen::getCreateTime);
         ImportPatentQueen importPatentQueen = this.getOne(queryWrapper, false);
         if (importPatentQueen != null) {
             total += 1;

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

@@ -49,10 +49,7 @@ public class NoveltyCompareRecordService {
         Integer projectId = noveltyCompareRecordDTO.getProjectId();
         Integer retrieveRecordId = noveltyCompareRecordDTO.getRetrieveRecordId();
         //TODO
-//        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        PersonnelVO personnelVO = new PersonnelVO();
-        personnelVO.setId("1");
-        personnelVO.setTenantId(1);
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         //添加对比文件
         Patent patent = new Patent();
         patent.setPatentNo(patentNo);
@@ -90,9 +87,19 @@ public class NoveltyCompareRecordService {
     }
 
     public String updateCompareRecord(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+
         String id = noveltyCompareRecordDTO.getId();
+        String patentNo =noveltyCompareRecordDTO.getPatentNo();
+        Integer projectId =noveltyCompareRecordDTO.getProjectId();
         Marking marking = new Marking();
         BeanUtils.copyProperties(noveltyCompareRecordDTO, marking);
+        Patent patent = new Patent();
+        patent.setPatentNo(patentNo);
+        importSinglePatentService.addPatentToProject(patentNo, projectId);
+        Integer compareLiteratureId = compareLiteratureService.addPatentCompareLiterature(patent, projectId, personnelVO.getId());
+        //获取专利
+        importPatentQueenService.add(patentNo, projectId);
         return esScratchWordsService.updateScratchWords(id, marking);
     }