20240929 添加查新对比记录

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

@@ -58,7 +58,7 @@ public class QueryCompareFileVO {
     /**
      *  备注
      */
-    private String remark;
+    private String fileRemark;
 
     /**
      * 总说明

src/main/java/cn/cslg/pas/domain/business/RetrieveRecord.java

@@ -80,5 +80,9 @@ public class RetrieveRecord extends BaseEntity<RetrieveRecord> {
      */
     @TableField(value = "search_setting")
     private String searchSetting;
-
+    /**
+     * 前端配置
+     */
+    @TableField(value = "is_delete")
+    private Boolean isDelete;
 }

src/main/java/cn/cslg/pas/service/common/RetrieveRecordService.java

@@ -13,6 +13,7 @@ import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.domain.business.RetrieveRecord;
 import cn.cslg.pas.mapper.RetrieveRecordMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -93,16 +94,22 @@ public class RetrieveRecordService extends ServiceImpl<RetrieveRecordMapper, Ret
      * @return
      */
     public List<Integer> deleteRetrieveRecord(RetrieveRecordDeDTO retrieveRecordDeDTO) {
+        PersonnelVO personnelVO=cacheUtils.getLoginUser(loginUtils.getId());
         List<Integer> ids = retrieveRecordDeDTO.getIds();
         Boolean isAll = retrieveRecordDeDTO.getIsAll();
+        UpdateWrapper<RetrieveRecord> retrieveRecordUpdateWrapper =new UpdateWrapper<>();
+        retrieveRecordUpdateWrapper.eq("create_id",personnelVO.getId());
+        retrieveRecordUpdateWrapper.set("is_delete",true);
         if (isAll != null && isAll) {
-            this.remove(new LambdaQueryWrapper<RetrieveRecord>());
+
         } else {
             //判空
             if (ids != null && ids.size() > 0) {
-                this.removeByIds(ids);
+                retrieveRecordUpdateWrapper.in("id",ids);
             }
         }
+        this.update(retrieveRecordUpdateWrapper);
+
         return ids;
     }
 
@@ -118,6 +125,8 @@ public class RetrieveRecordService extends ServiceImpl<RetrieveRecordMapper, Ret
         String createId = personnelVO.getId();
         LambdaQueryWrapper<RetrieveRecord> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(RetrieveRecord::getCreateId, createId)
+                .and(i->i.eq(RetrieveRecord::getIsDelete,false).or().isNull(RetrieveRecord::getIsDelete))
+                .and(i->i.eq(RetrieveRecord::getIfBySystem,true).or().isNull(RetrieveRecord::getIfBySystem))
                 .orderByDesc(RetrieveRecord::getRetrieveTime)
                 .orderByDesc(RetrieveRecord::getCreateTime);
         IPage<RetrieveRecord> retrieveRecords = this.page(new Page<>(retrieveRecordQueryDTO.getCurrent(), retrieveRecordQueryDTO.getSize()), queryWrapper);

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

@@ -23,6 +23,7 @@ import cn.cslg.pas.mapper.novelty.NoveltyCompareLiteratureMapper;
 import cn.cslg.pas.service.business.CompareLiteratureService;
 import cn.cslg.pas.service.business.es.EsPatentService;
 import cn.cslg.pas.service.business.es.EsScratchWordsService;
+import cn.cslg.pas.service.importPatent.ImportSinglePatentService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -74,7 +75,8 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
     private EsScratchWordsService esScratchWordsService;
     @Autowired
     private EsPatentService esPatentService;
-
+    @Autowired
+    private ImportSinglePatentService importSinglePatentService;
     public Records queryNoveltyCompareLiterature(LiteratureQueryDTO vo) throws Exception {
         Integer projectId = vo.getProjectId();
         Records records = new Records();
@@ -251,15 +253,19 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
         List<QueryCompareFileVO> queryCompareFileVOSTo = this.getBaseMapper().queryCompareFile(queryCompareFileDTOTo);
 
         for (QueryCompareFileVO queryCompareFileVO : queryCompareFileVOSFrom) {
+            importSinglePatentService.addPatentToProject(queryCompareFileVO.getLiteratureNo(),toProjectId);
             QueryCompareFileVO queryCompareFileVOTo = queryCompareFileVOSTo.stream().filter(item -> item.getLiteratureNo().equals(queryCompareFileVO.getLiteratureNo())).findFirst().orElse(null);
             if (queryCompareFileVOTo == null) {
                 CompareLiterature compareLiterature = new CompareLiterature();
                 BeanUtils.copyProperties(queryCompareFileVO, compareLiterature);
+                compareLiterature.setRemark(queryCompareFileVO.getFileRemark());
                 compareLiterature.setProjectId(toProjectId);
                 compareLiterature.setId(null);
                 compareLiterature.insert();
                 NoveltyCompareLiterature noveltyCompareLiterature = new NoveltyCompareLiterature();
                 BeanUtils.copyProperties(queryCompareFileVO, noveltyCompareLiterature);
+                compareLiterature.setRemark(queryCompareFileVO.getFileRemark());
+
                 noveltyCompareLiterature.setCompareLitertureId(compareLiterature.getId());
                 noveltyCompareLiterature.insert();
             } else {
@@ -271,11 +277,15 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
                     if (toId == null) {
                         NoveltyCompareLiterature noveltyCompareLiterature = new NoveltyCompareLiterature();
                         BeanUtils.copyProperties(queryCompareFileVO, noveltyCompareLiterature);
+                        noveltyCompareLiterature.setRemark(queryCompareFileVO.getFileRemark());
+
                         noveltyCompareLiterature.setCompareLitertureId(queryCompareFileVOTo.getCompareLitertureId());
                         noveltyCompareLiterature.insert();
                     } else {
                         NoveltyCompareLiterature noveltyCompareLiterature = new NoveltyCompareLiterature();
                         BeanUtils.copyProperties(queryCompareFileVOTo, noveltyCompareLiterature);
+                        noveltyCompareLiterature.setRemark(queryCompareFileVO.getFileRemark());
+
                         if (queryCompareFileVO.getBeneficialEffect() != null) {
                             noveltyCompareLiterature.setBeneficialEffect(noveltyCompareLiterature.getBeneficialEffect() + queryCompareFileVO.getBeneficialEffect());
                         }

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

@@ -43,23 +43,25 @@ public class NoveltyCompareRecordService {
     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();
-        Integer  retrieveRecordId =noveltyCompareRecordDTO.getRetrieveRecordId();
+        Integer retrieveRecordId = noveltyCompareRecordDTO.getRetrieveRecordId();
         //TODO
 //        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO.setId("1");
         personnelVO.setTenantId(1);
         //添加对比文件
-        Patent patent =new Patent();
+        Patent patent = new Patent();
         patent.setPatentNo(patentNo);
-        Integer compareLiteratureId =compareLiteratureService.addPatentCompareLiterature(patent, projectId, personnelVO.getId());
+        importSinglePatentService.addPatentToProject(patentNo, projectId);
+        Integer compareLiteratureId = compareLiteratureService.addPatentCompareLiterature(patent, projectId, personnelVO.getId());
         //获取专利
         importPatentQueenService.add(patentNo, projectId);
         //添加查新对比文件
-        AddCompareFileDTO addCompareFileDTO =new AddCompareFileDTO();
+        AddCompareFileDTO addCompareFileDTO = new AddCompareFileDTO();
         addCompareFileDTO.setId(compareLiteratureId);
         addCompareFileDTO.setRetrieveRecordId(retrieveRecordId);
         noveltyCompareLiteratureService.addCompareFile(addCompareFileDTO);
@@ -148,7 +150,7 @@ 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());
+                        List<SystemFile> temSystemFiles = systemFiles.stream().filter(tem -> item.getPictureUrl().contains(tem.getGuid())).collect(Collectors.toList());
                         queryVO.setSystemFileList(temSystemFiles);
                     }
                     queryVOS.add(queryVO);
@@ -171,25 +173,25 @@ public class NoveltyCompareRecordService {
     }
 
 
-    public List<String> copyCompareRecord(List<String> ids,Integer projectId,Integer fromProjectId) throws Exception{
-        if(ids==null||ids.size()==0){
+    public List<String> copyCompareRecord(List<String> ids, Integer projectId, Integer fromProjectId) throws Exception {
+        if (ids == null || ids.size() == 0) {
             return new ArrayList<>();
         }
         //根据id查询
-      List<Marking> markings =esScratchWordsService.getByIds(ids);
+        List<Marking> markings = esScratchWordsService.getByIds(ids);
 
-        if(markings!=null&&markings.size()>0) {
+        if (markings != null && markings.size() > 0) {
             markings.forEach(item -> item.setProjectId(projectId));
             esScratchWordsService.saveListToEs(markings);
         }
-      List<String> nos =markings.stream().map(Marking::getPatentNo).collect(Collectors.toList());
-      LambdaQueryWrapper<CompareLiterature> queryWrapper =new LambdaQueryWrapper<CompareLiterature>();
-       queryWrapper.eq(CompareLiterature::getProjectId,fromProjectId)
-               .in(CompareLiterature::getLiteratureNo,nos);
-
-        List<CompareLiterature> compareLiteratures =  compareLiteratureService.list(queryWrapper);
-        List<Integer> literatureIds =compareLiteratures.stream().map(CompareLiterature::getId).collect(Collectors.toList());
-        noveltyCompareLiteratureService.copyCompareFile(literatureIds,projectId,fromProjectId);
+        List<String> nos = markings.stream().map(Marking::getPatentNo).collect(Collectors.toList());
+        LambdaQueryWrapper<CompareLiterature> queryWrapper = new LambdaQueryWrapper<CompareLiterature>();
+        queryWrapper.eq(CompareLiterature::getProjectId, fromProjectId)
+                .in(CompareLiterature::getLiteratureNo, nos);
+
+        List<CompareLiterature> compareLiteratures = compareLiteratureService.list(queryWrapper);
+        List<Integer> literatureIds = compareLiteratures.stream().map(CompareLiterature::getId).collect(Collectors.toList());
+        noveltyCompareLiteratureService.copyCompareFile(literatureIds, projectId, fromProjectId);
         return new ArrayList<>();
 
     }

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

@@ -240,9 +240,7 @@ public class NoveltySearchRecordService extends ServiceImpl<RetrieveRecordMapper
             LambdaQueryWrapper<AssoRetrieveRecordProject> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(AssoRetrieveRecordProject::getRetrieveRecordId, retrieveIds);
             assoRetrieveRecordProjectService.remove(queryWrapper);
-            //删除记录
-            this.removeBatchByIds(retrieveIds);
-        }
+            }
         return retrieveIds;
     }
 
@@ -255,9 +253,11 @@ public class NoveltySearchRecordService extends ServiceImpl<RetrieveRecordMapper
         List<RetrieveRecord> retrieveRecords = this.list(queryWrapper);
 
         for (RetrieveRecord retrieveRecord : retrieveRecords) {
-            retrieveRecord.setId(null);
+            if(retrieveRecord.getIfBySystem()!=null&&retrieveRecord.getIfBySystem().equals(false)){
+                retrieveRecord.setId(null);
+            }
         }
-        this.saveBatch(retrieveRecords);
+        this.saveOrUpdateBatch(retrieveRecords);
         List<AssoRetrieveRecordProject> assoRetrieveRecordProjects = new ArrayList<>();
         retrieveRecords.forEach(item -> {
             AssoRetrieveRecordProject assoRetrieveRecordProject = new AssoRetrieveRecordProject();