Merge remote-tracking branch 'origin/master_novelty' into master_novelty

src/main/java/cn/cslg/pas/common/config/ElasticSearchClientConfig.java

@@ -56,7 +56,7 @@ public class  ElasticSearchClientConfig {
         public ElasticsearchClient elasticsearchClient() throws Exception {
             RestClientBuilder builder = RestClient.builder(new HttpHost(config, 9200, "http"));
             CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "Xiaoshi221101"));
+            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "xiaoshi221101"));
             SSLContext sslContext = SSLContextBuilder.create()
                     .loadTrustMaterial(new TrustSelfSignedStrategy())
                     .build();

src/main/java/cn/cslg/pas/common/dto/NoveltyProjectDTO/NoveltyCompareRecordDTO.java

@@ -29,6 +29,8 @@ public class NoveltyCompareRecordDTO {
      */
     private  String markColor;
 
+
+    private Integer retrieveRecordId;
     /**
      * 标注备注
      */

src/main/java/cn/cslg/pas/common/dto/NoveltyProjectDTO/NoveltyMarkDTO.java

@@ -4,10 +4,10 @@ import lombok.Data;
 
 @Data
 public class NoveltyMarkDTO {
-    private Integer id;
-    private String content;
+    private String id;
     private String markNoteText;
     private Integer projectId;
     private String patentNo;
+    private Integer retrieveRecordId;
 
 }

src/main/java/cn/cslg/pas/common/vo/NoveltyProjectVO/NoveltyCompareRecordQueryVO.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.common.vo.NoveltyProjectVO;
 
+import cn.cslg.pas.common.model.cronModel.SystemFile;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -94,6 +95,6 @@ public class NoveltyCompareRecordQueryVO {
      * 有益效果
      */
     private String beneficialEffect;
-    private List<String> SystemFiles;
+    private List<SystemFile> systemFileList;
 
 }

src/main/java/cn/cslg/pas/controller/novelty/NoveltyMarkController.java

@@ -36,7 +36,7 @@ public class NoveltyMarkController {
 
     @Operation(summary = "添加或编辑标注")
     @PostMapping("/edit")
-    private Response edit(@RequestBody NoveltyMarkDTO noveltyMarkDTO) {
+    public Response edit(@RequestBody NoveltyMarkDTO noveltyMarkDTO) {
         NoveltyCompareRecordDTO noveltyCompareRecordDTO = new NoveltyCompareRecordDTO();
         BeanUtils.copyProperties(noveltyMarkDTO, noveltyCompareRecordDTO);
         noveltyCompareRecordDTO.setMarkType(1);

src/main/java/cn/cslg/pas/domain/es/Marking.java

@@ -108,6 +108,6 @@ public class Marking {
         /**
      * 标的类型 1 技术特征 2代表图
      */
-    @JsonProperty("picture_url")
-    private List<String> targetType;
+    @JsonProperty("target_type")
+    private Integer targetType;
 }

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

@@ -25,6 +25,7 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
         ImportPatentQueen importPatentQueen = new ImportPatentQueen();
         importPatentQueen.setPatentNo(patentNo);
         importPatentQueen.setProjectId(projectId);
+
         importPatentQueen.insert();
         this.startImport();
 
@@ -43,8 +44,10 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
         } catch (Exception e) {
         }
         total = total - 1;
-        this.startImport();
         this.removeById(importPatentQueen);
+        this.startImport();
+
+
     }
      public  void  startImport(){
          total += 1;
@@ -54,7 +57,9 @@ public class ImportPatentQueenService extends ServiceImpl<ImportPatentQueenMappe
          LambdaQueryWrapper<ImportPatentQueen> queryWrapper = new LambdaQueryWrapper<>();
          queryWrapper.eq(ImportPatentQueen::getState, 0);
          ImportPatentQueen importPatentQueen = this.getOne(queryWrapper, false);
-         this.importPatent(importPatentQueen);
+         if(importPatentQueen!=null) {
+             this.importPatent(importPatentQueen);
+         }
      }
 }
 

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

@@ -1,5 +1,6 @@
 package cn.cslg.pas.service.novelty;
 
+import cn.cslg.pas.common.dto.AddCompareFileDTO;
 import cn.cslg.pas.common.dto.NoveltyProjectDTO.NoveltyCompareRecordDTO;
 import cn.cslg.pas.common.dto.NoveltyProjectDTO.QueryNoveltyCompareRecordDTO;
 import cn.cslg.pas.common.dto.QueryCompareFileDTO;
@@ -11,13 +12,16 @@ import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordQueryVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordVO;
 import cn.cslg.pas.common.vo.PatentWithIdVO;
 import cn.cslg.pas.common.vo.QueryCompareFileVO;
+import cn.cslg.pas.domain.business.novelty.NoveltyCompareLiterature;
 import cn.cslg.pas.domain.es.Marking;
+import cn.cslg.pas.domain.es.Patent;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.service.business.CompareLiteratureService;
 import cn.cslg.pas.service.business.es.EsScratchWordsService;
 import cn.cslg.pas.service.common.FileManagerService;
 import cn.cslg.pas.service.importPatent.ImportSinglePatentService;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -37,18 +41,29 @@ public class NoveltyCompareRecordService {
     private final EsScratchWordsService esScratchWordsService;
     private final NoveltyCompareLiteratureService noveltyCompareLiteratureService;
     private final FileManagerService fileManagerService;
-
+    private final ImportPatentQueenService importPatentQueenService;
     public String addCompareRecord(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
         String patentNo = noveltyCompareRecordDTO.getPatentNo();
         Integer projectId = noveltyCompareRecordDTO.getProjectId();
-        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer  retrieveRecordId =noveltyCompareRecordDTO.getRetrieveRecordId();
+        //TODO
+//        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        PersonnelVO personnelVO = new PersonnelVO();
+        personnelVO.setId("1");
+        personnelVO.setTenantId(1);
         //获取专利
-        PatentWithIdVO patentWithIdVO = importSinglePatentService.addPatentToProject(patentNo, projectId);
+   importPatentQueenService.add(patentNo, projectId);
         //添加对比文件
-        compareLiteratureService.addPatentCompareLiterature(patentWithIdVO.getPatent(), projectId, personnelVO.getId());
+        Patent patent =new Patent();
+        patent.setPatentNo(patentNo);
+        Integer compareLiteratureId =compareLiteratureService.addPatentCompareLiterature(patent, projectId, personnelVO.getId());
 
-        //TODO 添加查新对比文件
+        //添加查新对比文件
 
+        AddCompareFileDTO addCompareFileDTO =new AddCompareFileDTO();
+        addCompareFileDTO.setCompareLitertureId(compareLiteratureId);
+        addCompareFileDTO.setRetrieveRecordId(retrieveRecordId);
+        noveltyCompareLiteratureService.addCompareFile(addCompareFileDTO);
         //添加记录
 
         if (personnelVO != null) {
@@ -67,6 +82,7 @@ public class NoveltyCompareRecordService {
             id = esScratchWordsService.saveToEs(marking);
             return id;
         } catch (Exception e) {
+            e.printStackTrace();
             throw new XiaoShiException("保存失败");
         }
 
@@ -132,7 +148,8 @@ public class NoveltyCompareRecordService {
                     queryVO.setBeneficialEffect(queryCompareFileVO.getBeneficialEffect());
                     queryVO.setExcuteCase(queryCompareFileVO.getExcuteCase());
                     if (systemFiles.size() > 0 && item.getPictureUrl() != null && item.getPictureUrl().size() > 0) {
-
+               List<SystemFile> temSystemFiles =systemFiles.stream().filter(tem->item.getPictureUrl().contains(tem.getGuid())).collect(Collectors.toList());
+                        queryVO.setSystemFileList(temSystemFiles);
                     }
                     queryVOS.add(queryVO);
                 }

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

@@ -0,0 +1,103 @@
+package cn.cslg.pas.novelty;
+
+import cn.cslg.pas.common.dto.DomainFieldDTO;
+import cn.cslg.pas.common.dto.NoveltyProjectDTO.NoveltyMarkDTO;
+import cn.cslg.pas.common.utils.GenerateObjectUtil;
+import cn.cslg.pas.controller.AvoidDesignController;
+import cn.cslg.pas.controller.novelty.NoveltyMarkController;
+import cn.cslg.pas.domain.business.FollowUp;
+import cn.cslg.pas.service.business.AvoidDesignService;
+import cn.cslg.pas.common.utils.Response;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/12/5
+ */
+@SpringBootTest
+public class NoveltyCompareRecordTests {
+    @Autowired
+    private NoveltyMarkController noveltyMarkController;
+    @Test
+    public void editMark() throws Exception {
+        NoveltyMarkDTO noveltyMarkDTO = new NoveltyMarkDTO();
+        noveltyMarkDTO.setMarkNoteText("测试标注");
+        noveltyMarkDTO.setProjectId(1);
+        noveltyMarkDTO.setPatentNo("CN202420249312.5");
+        noveltyMarkDTO.setRetrieveRecordId(1);
+        Response response = noveltyMarkController.edit(noveltyMarkDTO);
+        System.out.println(response);
+    }
+    @Test
+    public void editMark2() throws Exception {
+        NoveltyMarkDTO noveltyMarkDTO = new NoveltyMarkDTO();
+        noveltyMarkDTO.setId("ZIQHPZIBBmwxCVit3e0h");
+        noveltyMarkDTO.setMarkNoteText("测试标注1");
+        noveltyMarkDTO.setProjectId(1);
+        noveltyMarkDTO.setPatentNo("CN202420249312.5");
+        noveltyMarkDTO.setRetrieveRecordId(1);
+        Response response = noveltyMarkController.edit(noveltyMarkDTO);
+        System.out.println(response);
+    }
+
+
+
+    @Test
+    public void editCompareRecord() throws Exception {
+        String json ="{\n" +
+                "  \"Id\": \"7fc03caf-c5e7-4f35-b5fe-e40b6817b650\",\n" +
+                "  \"id\": null,\n" +
+                "  \"patentNo\": \"EP1642661A4\",\n" +
+                "  \"isPublic\": false,\n" +
+                "  \"markColor\": \"#ff0000\",\n" +
+                "  \"markNoteText\": \"123131\",\n" +
+                "  \"markType\": 2,\n" +
+                "  \"markSelectField\": \"摘要原文\",\n" +
+                "  \"markSelectText\": \"e present invention includes the steps of: preparing a rare-earth alloy powder with remanent magnetization; feeding the powder onto a track 22, which is defined by a side surface 22a and a lower surface 22b that is sloped so as\",\n" +
+                "  \"markSite\": 55,\n" +
+                "  \"publicScope\": 1,\n" +
+                "  \"createFrom\": \"1\",\n" +
+                "  \"projectId\": \"5341\",\n" +
+                "  \"patentTitle\": \"Process and system for producing granulation powder of rare earth alloy and process for producing sintered object of rare earth alloy\"\n" +
+                "}";
+
+        NoveltyMarkDTO noveltyMarkDTO = new NoveltyMarkDTO();
+        noveltyMarkDTO.setMarkNoteText("测试标注");
+        noveltyMarkDTO.setProjectId(1);
+  
+        noveltyMarkDTO.setRetrieveRecordId(1);
+        Response response = noveltyMarkController.edit(noveltyMarkDTO);
+        System.out.println(response);
+    }
+    @Test
+    public void eidtCompareRecord2() throws Exception {
+        NoveltyMarkDTO noveltyMarkDTO = new NoveltyMarkDTO();
+        noveltyMarkDTO.setId("ZIQHPZIBBmwxCVit3e0h");
+        noveltyMarkDTO.setMarkNoteText("测试标注1");
+        noveltyMarkDTO.setProjectId(1);
+        noveltyMarkDTO.setPatentNo("CN202420249312.5");
+        noveltyMarkDTO.setRetrieveRecordId(1);
+        Response response = noveltyMarkController.edit(noveltyMarkDTO);
+        System.out.println(response);
+    }
+
+    @Test
+    public void testUpdate() {
+
+
+    }
+
+    @Test
+    public void testGet() throws Exception {
+        Integer gen = 2;
+        Integer size = 1;
+        Integer a = gen >= size ? size : gen;
+        System.out.println(a);
+
+    }
+}

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

@@ -1,11 +1,13 @@
 package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.dto.DomainFieldDTO;
+import cn.cslg.pas.common.dto.NoveltyProjectDTO.NoveltyMarkDTO;
 import cn.cslg.pas.common.dto.business.AvoidDesignDTO;
 import cn.cslg.pas.common.dto.business.AvoidDesignInsertDTO;
 import cn.cslg.pas.common.utils.GenerateObjectUtil;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.controller.AvoidDesignController;
+import cn.cslg.pas.controller.novelty.NoveltyMarkController;
 import cn.cslg.pas.domain.business.FollowUp;
 import cn.cslg.pas.service.business.AvoidDesignService;
 import org.junit.jupiter.api.Test;
@@ -21,14 +23,8 @@ import java.util.List;
  */
 @SpringBootTest
 public class AvoidDesignServiceTests {
-    @Autowired
-    private AvoidDesignService avoidDesignService;
 
-    @Autowired
-    private AvoidDesignController avoidDesignController;
 
-    @Autowired
-    private GenerateObjectUtil generateObjectUtil;
 
     @Test
     public void test() throws Exception {