20240929 添加查新对比记录

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

@@ -11,7 +11,7 @@ public class NoveltyReportReferenceQueryDTO {
     private String fileName;
     private Integer current;
     private Integer size;
-
+    private Integer id;
 
 
 }

src/main/java/cn/cslg/pas/common/dto/business/GetReferencesDTO.java

@@ -16,4 +16,5 @@ public class GetReferencesDTO {
     private Integer current;
     private Integer size;
     private List<OrderDTO> orderDTOList;
+    private Integer id;
 }

src/main/java/cn/cslg/pas/common/vo/CompareLiteratureVO.java

@@ -122,5 +122,5 @@ public class CompareLiteratureVO  {
      */
     private String beneficialEffect;
     //标注
-    private NoveltyCompareRecordVO noveltyCompareRecordVO;
+    private List<NoveltyCompareRecordVO> noveltyCompareRecordVOS;
 }

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

@@ -64,4 +64,5 @@ public class NoveltyReferencesVO {
     private Boolean ifHaveFinalFile;
 
     private String configMessage;
+    private Integer templateId;
 }

src/main/java/cn/cslg/pas/controller/NoveltyProjectController.java

@@ -192,7 +192,7 @@ public class NoveltyProjectController {
     @Operation(summary = "查询查新检索报告模板")
     @PostMapping("/queryTemplate")
     public Response queryTemplate(@RequestBody QueryTemplateDTO queryTemplateDTO) throws IOException {
-        Records records = noveltyReportTemplateService.queryTemplate(queryTemplateDTO);
+         Records records = noveltyReportTemplateService.queryTemplate(queryTemplateDTO);
         return Response.success(records);
     }
 

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

@@ -237,9 +237,12 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
                     literatureVO.setExcuteCase(noveltyCompareLiterature.getExcuteCase());
                     literatureVO.setBeneficialEffect(noveltyCompareLiterature.getBeneficialEffect());
                 }
-                if (CollectionUtils.isEmpty(recordVOS)) {
-                    NoveltyCompareRecordVO recordVO = recordVOS.stream().filter(i -> i.getPatentNo().equals(literatureVO.getLiteratureNo())).findFirst().orElse(new NoveltyCompareRecordVO());
-                    literatureVO.setNoveltyCompareRecordVO(recordVO);
+                if (!CollectionUtils.isEmpty(recordVOS)) {
+                    List<NoveltyCompareRecordVO> collect = recordVOS.stream().filter(i -> i.getPatentNo().equals(literatureVO.getLiteratureNo())).collect(Collectors.toList());
+                    if (CollectionUtils.isEmpty(collect)) {
+                        collect = new ArrayList<>();
+                    }
+                    literatureVO.setNoveltyCompareRecordVOS(collect);
                 }
             }
         }

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

@@ -126,6 +126,7 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         String fileName = getReferencesDTO.getFileName();
         Integer pageNum = getReferencesDTO.getCurrent();
         Integer pageSize = getReferencesDTO.getSize();
+        Integer id=getReferencesDTO.getId();
         List<OrderDTO> orderDTOList = getReferencesDTO.getOrderDTOList();
         //分页配置
         Page<References> page = new Page<>(pageNum, pageSize);
@@ -134,6 +135,10 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         if (fileName != null && !fileName.equals("")) {
             queryWrapper.lambda().like(References::getReferencesName, fileName);
         }
+        if(id!=null){
+            queryWrapper.lambda().eq(References::getId, id);
+
+        }
         //添加排序逻辑
         if (orderDTOList != null && !orderDTOList.isEmpty() && orderDTOList.size() == 1) {
             OrderDTO orderDTO = orderDTOList.get(0);

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

@@ -431,6 +431,7 @@ public class EsScratchWordsService {
                 Marking marking = hit.source();
                 NoveltyCompareRecordVO noveltyCompareRecordVO = new NoveltyCompareRecordVO();
                 BeanUtils.copyProperties(marking, noveltyCompareRecordVO);
+                noveltyCompareRecordVO.setMarkNoteText(marking.getMarkNoteText());
                 noveltyCompareRecordVO.setId(hit.id());
                 vos.add(noveltyCompareRecordVO);
             }

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

@@ -111,6 +111,7 @@ public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportRef
                 noveltyReferencesVO.setIfHaveFinalFile(noveltyReportReference.getIfHaveFinalFile());
                 noveltyReferencesVO.setDataSource(noveltyReportReference.getDataSource());
                 noveltyReferencesVO.setConfigMessage(noveltyReportReference.getConfigMessage());
+                noveltyReferencesVO.setTemplateId(noveltyReportReference.getTemplateId());
             }
             noveltyReferencesVOS.add(noveltyReferencesVO);
 

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

@@ -49,19 +49,24 @@ public class NoveltyReportTemplateService extends ServiceImpl<NoveltyReportTempl
 //    }
 
     public Records queryTemplate(QueryTemplateDTO queryTemplateDTO) throws IOException {
+        Integer temId = queryTemplateDTO.getTemplateId();
+        Long size = queryTemplateDTO.getSize();
+        Long current = queryTemplateDTO.getCurrent();
         Records records = new Records();
         Long total = null;
         List<QueryTemplateVO> queryTemplateVOS = new ArrayList<>();
         List<NoveltyReportTemplate> noveltyReportTemplates = new ArrayList<>();
-        if (queryTemplateDTO.getTemplateId() != null) {
-            NoveltyReportTemplate noveltyReportTemplate = this.getById(queryTemplateDTO.getTemplateId());
-            noveltyReportTemplates.add(noveltyReportTemplate);
-        } else {
-            LambdaQueryWrapper<NoveltyReportTemplate> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.orderByDesc(NoveltyReportTemplate::getCreateTime);
-            IPage<NoveltyReportTemplate> noveltyReportTemplatePage = this.page(new Page<>(queryTemplateDTO.getCurrent(), queryTemplateDTO.getSize()), queryWrapper);
+        LambdaQueryWrapper<NoveltyReportTemplate> queryWrapper = new LambdaQueryWrapper<>();
+        if (temId != null) {
+            queryWrapper.eq(NoveltyReportTemplate::getId, temId);
+        }
+        if (size != null && current != null) {
+            IPage<NoveltyReportTemplate> noveltyReportTemplatePage = this.page(new Page<>(current, size), queryWrapper);
             noveltyReportTemplates = noveltyReportTemplatePage.getRecords();
             total = noveltyReportTemplatePage.getTotal();
+        } else {
+            noveltyReportTemplates = this.list();
+            total = (long) noveltyReportTemplates.size();
         }
         if (!noveltyReportTemplates.isEmpty()) {
             queryTemplateVOS = this.loadTemplateVOS(noveltyReportTemplates);

src/main/resources/application-dev.yml

@@ -61,8 +61,8 @@ spring:
     #初始化表结构
     jdbc:
       initialize-schema:  always
-authorUrl: http://localhost:8885
-PCSUrl: http://localhost:8885
+authorUrl: http://localhost:8880
+PCSUrl: http://localhost:8880
 #OPSUrl: http://192.168.2.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8879