20240929 添加查新对比记录

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

@@ -7,7 +7,7 @@ public class  AddCompareFileDTO {
 
     private Integer compareFileId;
 
-    private Integer compareLitertureId;
+    private Integer id;
 
     private Integer retrieveRecordId;
 

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

@@ -208,7 +208,7 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
 
         compareLiteratureVOS = this.loadCompareLiterature(compareLiteratures, reportProject);
         //装载查新对比文件和标注
-        this.loadCompareLiteratureVOS(compareLiteratureVOS,projectId);
+        this.loadCompareLiteratureVOS(compareLiteratureVOS, projectId);
 
         records.setData(compareLiteratureVOS);
 
@@ -538,8 +538,8 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
         } catch (Exception e) {
 
         }
-        if(patentWithIdVO==null){
-            return  null;
+        if (patentWithIdVO == null) {
+            return null;
         }
         literatureNo = patent.getPatentNo();
         //判断该专利是否已经作为文献
@@ -740,35 +740,61 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
     }
 
 
-
-    public  void addAssoToEs(){
-        List<String> patentNos =new ArrayList<>();
-        LambdaQueryWrapper<CompareLiterature> compareLiteratureLambdaQueryWrapper =new LambdaQueryWrapper<>();
-       compareLiteratureLambdaQueryWrapper.eq(CompareLiterature::getType,0);
-        List<CompareLiterature> compareLiteratures =this.list(compareLiteratureLambdaQueryWrapper);
-        int i=0;
-        for (CompareLiterature item: compareLiteratures){
-           i++;
+    public void addAssoToEs() {
+        List<String> patentNos = new ArrayList<>();
+        LambdaQueryWrapper<CompareLiterature> compareLiteratureLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        compareLiteratureLambdaQueryWrapper.eq(CompareLiterature::getType, 0);
+        List<CompareLiterature> compareLiteratures = this.list(compareLiteratureLambdaQueryWrapper);
+        int i = 0;
+        for (CompareLiterature item : compareLiteratures) {
+            i++;
             System.out.println(i);
-            String patentNo =item.getLiteratureNo().trim();
-            Integer projectId =item.getProjectId();
+            String patentNo = item.getLiteratureNo().trim();
+            Integer projectId = item.getProjectId();
             try {
-                PatentWithIdVO  patentWithIdVO = esService.getIdByPatentNo(patentNo);
-                if(patentWithIdVO==null){
-                        // 不存在该专利则从数据库获取著录信息并保存
-                        patentWithIdVO = importSinglePatentService.addSinglePatent(patentNo);
+                PatentWithIdVO patentWithIdVO = esService.getIdByPatentNo(patentNo);
+                if (patentWithIdVO == null) {
+                    // 不存在该专利则从数据库获取著录信息并保存
+                    patentWithIdVO = importSinglePatentService.addSinglePatent(patentNo);
 
                 }
                 importSinglePatentService.saveAssoPatentProjectToEs(projectId, patentWithIdVO.getId());
-            }
-catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
-    patentNos.add(patentNo);
+                patentNos.add(patentNo);
             }
 
         }
-System.out.println(patentNos);
+        System.out.println(patentNos);
     }
 
+    public CompareLiterature updateByPatentNo(Integer projectId, String patentNo) {
+        Integer id = this.getHaveAddIdByNos(projectId, patentNo);
+        CompareLiterature compareLiterature = this.getById(id);
+        PatentWithIdVO patentWithIdVO = new PatentWithIdVO();
+        Patent patent = new Patent();
+        try {
+            patentWithIdVO = esService.getIdByPatentNo(patentNo);
+            if (patentWithIdVO == null) {
+                // 不存在该专利则从数据库获取著录信息并保存
+                patentWithIdVO = importSinglePatentService.addSinglePatent(patentNo);
+                patent = patentWithIdVO.getPatent();
+            } else {
+                patent = patentWithIdVO.getPatent();
+            }
+        } catch (Exception e) {
 
+        }
+        String name = "";
+        if (patent != null) {
+            if (patent.getTitle() != null && patent.getTitle().size() != 0) {
+                name = patent.getTitle().get(0).getTextContent();
+            }
+            compareLiterature.setAppDate(patent.getAppDate());
+            compareLiterature.setPublicDate(patent.getPublicDate());
+        }
+        compareLiterature.setName(name);
+        compareLiterature.updateById();
+        return compareLiterature;
+    }
 }

src/main/java/cn/cslg/pas/service/business/es/EsScratchWordsService.java

@@ -27,6 +27,7 @@ import cn.cslg.pas.service.permissions.PermissionService;
 import cn.cslg.pas.service.query.FormatQueryService;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.FieldValue;
+import co.elastic.clients.elasticsearch._types.Refresh;
 import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.elasticsearch._types.aggregations.*;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
@@ -247,7 +248,7 @@ public class EsScratchWordsService {
     public String saveToEs(Marking marking) throws Exception {
         IndexResponse indexResponse = client.index(i -> i
                 .index("patent_marking")
-                .document(marking)
+                .document(marking).refresh(Refresh.True)
         );
         return indexResponse.id();
 
@@ -258,7 +259,7 @@ public class EsScratchWordsService {
         UpdateRequest<Marking, Marking> req;
         req = UpdateRequest.of(
                 b -> b.index("patent_marking").id(id)
-                        .doc(marking)
+                        .doc(marking).refresh(Refresh.True)
         );
         try {
             client.update(req, Marking.class);

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

@@ -3,6 +3,7 @@ package cn.cslg.pas.service.novelty;
 import cn.cslg.pas.common.dto.es.RefreshPatentDTO;
 import cn.cslg.pas.domain.business.novelty.ImportPatentQueen;
 import cn.cslg.pas.mapper.novelty.ImportPatentQueenMapper;
+import cn.cslg.pas.service.business.CompareLiteratureService;
 import cn.cslg.pas.service.importPatent.ImportSinglePatentService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMapper, ImportPatentQueen> {
     private final ImportSinglePatentService importSinglePatentService;
+    private final CompareLiteratureService compareLiteratureService;
     private Integer total = 0;
 
     public void add(String patentNo, Integer projectId) {
@@ -38,9 +40,11 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
     public void importPatent(ImportPatentQueen importPatentQueen) {
         RefreshPatentDTO refreshPatentDTO = new RefreshPatentDTO();
         refreshPatentDTO.setPatentNo(importPatentQueen.getPatentNo());
-
+        Integer projectId = importPatentQueen.getProjectId();
+        String patentNo = importPatentQueen.getPatentNo();
         try {
             importSinglePatentService.refreshPatent(refreshPatentDTO);
+            compareLiteratureService.updateByPatentNo(projectId, patentNo);
         } catch (Exception e) {
         }
         total = total - 1;
@@ -49,18 +53,19 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
 
 
     }
-     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) {
-             this.importPatent(importPatentQueen);
-         }
-     }
+
+    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) {
+            this.importPatent(importPatentQueen);
+        }
+    }
 }
 
 

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

@@ -56,7 +56,7 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
     }
 
     public Integer addCompareFile(AddCompareFileDTO vo) {
-        Integer compareLitertureId = vo.getCompareLitertureId();
+        Integer compareLitertureId = vo.getId();
         NoveltyCompareLiterature literature = noveltyCompareLiteratureMapper.selectOne(new LambdaQueryWrapper<NoveltyCompareLiterature>()
                 .eq(NoveltyCompareLiterature::getCompareLitertureId, compareLitertureId));
         if (ObjectUtils.isEmpty(literature)) {
@@ -70,6 +70,7 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
     public Integer editCompareFile(AddCompareFileDTO vo) {
         NoveltyCompareLiterature literature = noveltyCompareLiteratureMapper.selectById(vo.getCompareFileId());
         BeanUtils.copyProperties(vo, literature);
+        literature.setCompareLitertureId(vo.getId());
         literature.updateById();
         return literature.getId();
     }

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

@@ -61,7 +61,7 @@ public class NoveltyCompareRecordService {
 
         //添加查新对比文件
         AddCompareFileDTO addCompareFileDTO =new AddCompareFileDTO();
-        addCompareFileDTO.setCompareLitertureId(compareLiteratureId);
+        addCompareFileDTO.setId(compareLiteratureId);
         addCompareFileDTO.setRetrieveRecordId(retrieveRecordId);
         noveltyCompareLiteratureService.addCompareFile(addCompareFileDTO);
         //添加记录

src/test/java/cn/cslg/pas/service/NoveltyProjectTest.java

@@ -135,12 +135,6 @@ public class NoveltyProjectTest {
         System.out.println(technicalCaseVO);
     }
 
-    @Test
-    public void deleteTechnicalCase() throws Exception {
-        TechnicalCaseIdDTO vo = new TechnicalCaseIdDTO();
-        vo.setTechnicalCaseId(2);
-        technicalCaseService.deleteTechnicalCase(vo);
-    }
 
     @Test
     public void querySimilarInventionPoint() throws IOException {
@@ -151,7 +145,7 @@ public class NoveltyProjectTest {
     @Test
     public void addCompareFile() {
         AddCompareFileDTO vo = new AddCompareFileDTO();
-        vo.setCompareLitertureId(234);
+        vo.setId(234);
         vo.setRemark("huhuhuhuhuh");
         vo.setGeneralRemark("yhyhyhyjyjy");
         vo.setIfEffectinv(true);
@@ -164,7 +158,7 @@ public class NoveltyProjectTest {
     public void editCompareFile() {
         AddCompareFileDTO vo = new AddCompareFileDTO();
         vo.setCompareFileId(6);
-        vo.setCompareLitertureId(0);
+        vo.setId(0);
         vo.setRemark("tgtgtgtgtt");
         vo.setGeneralRemark("gtgtgdgsdfsdfsd");
         vo.setIfEffectinv(true);