20240929 添加查新对比记录

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

@@ -33,7 +33,7 @@ public class NoveltyCompareRecordController {
 
     @Operation(summary = "添加或编辑对比记录")
     @PostMapping("/edit")
-    private Response edit(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
+    public Response edit(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
         noveltyCompareRecordDTO.setMarkType(2);
         String id = noveltyCompareRecordService.addOrUpdateCompareRecord(noveltyCompareRecordDTO);
         return Response.success(id);
@@ -41,14 +41,14 @@ public class NoveltyCompareRecordController {
 
     @Operation(summary = "删除对比记录")
     @PostMapping("/remove")
-    private Response remove(@RequestBody List<String> ids) {
+    public Response remove(@RequestBody List<String> ids) {
       noveltyCompareRecordService.removeCompareRecord(ids);
       return Response.success(ids);
     }
 
     @Operation(summary = "查询对比记录")
     @PostMapping("/queryCompareRecord")
-    private Response queryCompareRecord(@RequestBody QueryNoveltyCompareRecordDTO queryNoveltyCompareRecordDTO) throws Exception {
+    public Response queryCompareRecord(@RequestBody QueryNoveltyCompareRecordDTO queryNoveltyCompareRecordDTO) throws Exception {
        List<NoveltyCompareRecordQueryVO> noveltyCompareRecordVOS= noveltyCompareRecordService.queryCompareRecord(queryNoveltyCompareRecordDTO);
         return Response.success(noveltyCompareRecordVOS);
     }

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

@@ -37,12 +37,18 @@ public class Marking {
     private String markNoteText;
 
     /**
-     * 标注类型 1查新报告对比记录
+     * 标注样式
      */
     @JsonProperty("mark_type")
     private  Integer markType;
 
     /**
+     * 标的类型 1 技术特征 2代表图
+     */
+    @JsonProperty("use_type")
+    private Integer useType;
+
+    /**
      * 标注栏位
      */
     @JsonProperty("mark_select_field")

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

@@ -59,7 +59,6 @@ public class NoveltyCompareRecordService {
         Integer compareLiteratureId =compareLiteratureService.addPatentCompareLiterature(patent, projectId, personnelVO.getId());
 
         //添加查新对比文件
-
         AddCompareFileDTO addCompareFileDTO =new AddCompareFileDTO();
         addCompareFileDTO.setCompareLitertureId(compareLiteratureId);
         addCompareFileDTO.setRetrieveRecordId(retrieveRecordId);

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

@@ -1,13 +1,17 @@
 package cn.cslg.pas.novelty;
 
 import cn.cslg.pas.common.dto.DomainFieldDTO;
+import cn.cslg.pas.common.dto.NoveltyProjectDTO.NoveltyCompareRecordDTO;
 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.NoveltyCompareRecordController;
 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 com.alibaba.fastjson2.JSONObject;
+import com.google.gson.JsonObject;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -23,6 +27,8 @@ import java.util.List;
 public class NoveltyCompareRecordTests {
     @Autowired
     private NoveltyMarkController noveltyMarkController;
+    @Autowired
+    private NoveltyCompareRecordController noveltyCompareRecordController;
     @Test
     public void editMark() throws Exception {
         NoveltyMarkDTO noveltyMarkDTO = new NoveltyMarkDTO();
@@ -66,12 +72,15 @@ public class NoveltyCompareRecordTests {
                 "  \"patentTitle\": \"Process and system for producing granulation powder of rare earth alloy and process for producing sintered object of rare earth alloy\"\n" +
                 "}";
 
+
+        NoveltyCompareRecordDTO noveltyCompareRecordDTO =new NoveltyCompareRecordDTO();
+        JSONObject.parseObject(json,NoveltyCompareRecordDTO.class);
         NoveltyMarkDTO noveltyMarkDTO = new NoveltyMarkDTO();
         noveltyMarkDTO.setMarkNoteText("测试标注");
         noveltyMarkDTO.setProjectId(1);
-  
+
         noveltyMarkDTO.setRetrieveRecordId(1);
-        Response response = noveltyMarkController.edit(noveltyMarkDTO);
+        Response response = noveltyCompareRecordController.edit(noveltyCompareRecordDTO);
         System.out.println(response);
     }
     @Test