添加报告专利对比文献

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

@@ -75,20 +75,12 @@ public class ImportTaskAMVO {
     private Integer doneNum;
     private String createId;
     private ProgressVO progressVO;
-
+     private Integer projectType;
     private char ifAddPicture;
     private char ifAddFullText;
     private char ifAddPDF;
     private char  ifAddCatalogue;
 
-    private Boolean ifAddPictureDone;
-
-    private Boolean ifAddPatentDone;
-    private Boolean ifAddPDFDone;
-    private Integer messageDoneNum;
-    private Integer pdfDoneNum;
-    private Integer pictureDoneNum;
-
     private Integer shouldSaveCounter;
 
     private Integer haveSaveCounter;

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

@@ -0,0 +1,42 @@
+package cn.cslg.pas.domain.business;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.joda.time.DateTime;
+
+/**
+ * <p>
+ * 事件表
+ * </p>
+ *
+ * @author 李仁杰
+ * @since 2022-12-8
+ */
+@Data
+@TableName("compare_literature")
+/*数据库中的表对应的类
+ */
+public class CompareLiterature extends BaseEntity<CompareLiterature> {
+    @TableField(value = "project_id")
+    private Integer projectId;
+    @TableField(value = "literature_no")
+    private String literatureNo;
+    @TableField(value = "remark")
+    private String remark;
+    @TableField(value = "state")
+    private Integer state;
+    @TableField(value = "name")
+    private String name;
+    @TableField(value = "type")
+    private Integer type;
+    @TableField(value = "sys_order")
+    private Integer sysOrder;
+    @TableField(value = "description")
+    private String description;
+    @TableField(value = "create_id")
+    private String createId;
+    @TableField(value = "create_time")
+    private DateTime createTime;
+}

src/main/java/cn/cslg/pas/mapper/CompareLiteratureMapper.java

@@ -0,0 +1,16 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.AssoEventFile;
+import cn.cslg.pas.domain.business.CompareLiterature;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 任务可见栏位表
+ *
+ * @author chenyu
+ * @date 2023/10/20
+ */
+@Repository
+public interface CompareLiteratureMapper extends BaseMapper<CompareLiterature> {
+}

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

@@ -0,0 +1,44 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.domain.business.CompareLiterature;
+import cn.cslg.pas.domain.business.Matter;
+import cn.cslg.pas.mapper.CompareLiteratureMapper;
+import cn.cslg.pas.mapper.MatterMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author lrj
+ * @Date 2023/12/8
+ */
+@Slf4j
+@Service
+public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMapper, CompareLiterature> {
+
+    //添加专利对比文献
+    public Integer addPatentCompareLiterature(String patentNo, Integer projectId,String createId) {
+        Integer id = null;
+        //根据专利号和报告id查询是否已经保存
+        LambdaQueryWrapper<CompareLiterature> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CompareLiterature::getLiteratureNo, patentNo);
+        queryWrapper.eq(CompareLiterature::getProjectId, projectId);
+        List<CompareLiterature> compareLiteratures = this.list(queryWrapper);
+        if (compareLiteratures.size() <= 0) {
+            CompareLiterature compareLiterature = new CompareLiterature();
+            compareLiterature.setCreateId(createId);
+            compareLiterature.setProjectId(projectId);
+            compareLiterature.setLiteratureNo(patentNo);
+            compareLiterature.setName(patentNo);
+            compareLiterature.insert();
+            return compareLiterature.getId();
+        }
+        else {
+            return compareLiteratures.get(0).getId();
+        }
+    }
+}

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

@@ -231,7 +231,6 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
         }
     }
 
-
     private List<PatentRightContent> loadPatentRightContent(List<RePatentClaim> rePatentClaims) {
         List<PatentRightContent> patentRightContents = new ArrayList<>();
         rePatentClaims.forEach(item -> {
@@ -314,7 +313,6 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
            Integer sort = patentRights.get(i).getSort();
 
            featureList = allFeatures.stream().filter(item -> item.getRightSort().equals(sort)).collect(Collectors.toList());
-
            PatentRightVo patentRightVo = new PatentRightVo();
            patentRightVo.setPatentNo(patentRights.get(i).getPatentNo());
            patentRightVo.setFeatures(featureList);

src/main/java/cn/cslg/pas/service/importPatent/SavePatentToEsThread.java

@@ -8,6 +8,7 @@ import cn.cslg.pas.domain.business.ImportTask;
 import cn.cslg.pas.domain.es.ESImportTask;
 import cn.cslg.pas.domain.es.Patent;
 import cn.cslg.pas.domain.es.PatentJoin;
+import cn.cslg.pas.service.business.CompareLiteratureService;
 import cn.cslg.pas.service.business.ImportTaskService;
 import cn.cslg.pas.service.business.es.EsService;
 import cn.cslg.pas.service.common.FileManagerService;
@@ -80,6 +81,12 @@ public class SavePatentToEsThread extends Thread {
                             patentChild.setProjectId(importTaskAMVO.getProjectId());
                             esService.addChildPatent(patentChild, patentId);
                         }
+
+                        //添加报告对比文件
+                        if (importTaskAMVO.getProjectType() != null && importTaskAMVO.getProjectType().equals(1)) {
+                            CompareLiteratureService compareLiteratureService = applicationContext.getBean(CompareLiteratureService.class);
+                            compareLiteratureService.addPatentCompareLiterature(patent.getPatentNo(), importTaskAMVO.getProjectId(), importTaskAMVO.getCreateId());
+                        }
                     }
                     //和任务关联
                     if (importTaskAMVO.getId() != null) {
@@ -103,9 +110,9 @@ public class SavePatentToEsThread extends Thread {
                     }
                 }
                 //导入完成，通知前台
-                taskThread.updateProcess(false,1,"");
+                taskThread.updateProcess(false, 1, "");
             } catch (Exception e) {
-                taskThread.updateProcess(true,1,"");
+                taskThread.updateProcess(true, 1, "");
             }
         }
         taskThread.awakeTaskThread();

src/main/java/cn/cslg/pas/service/importPatent/SchedulingTaskService.java

@@ -57,9 +57,6 @@ public class SchedulingTaskService {
                     importTaskList.get(i).updateById();
                     importTaskAMVOS.get(i).setState(1);
                     importTaskAMVOS.get(i).setHaveSaveCounter(0);
-                    importTaskAMVOS.get(i).setMessageDoneNum(0);
-                    importTaskAMVOS.get(i).setPictureDoneNum(0);
-                    importTaskAMVOS.get(i).setPdfDoneNum(0);
                     TaskThread taskThread = new TaskThread(importTaskAMVOS.get(i), applicationContext);
                     executor.execute(taskThread);
                 }
@@ -94,7 +91,7 @@ public class SchedulingTaskService {
                 importTaskAMVO.setDbType(importTaskCondition.getDbType());
                 importTaskAMVO.setOrderBy(importTaskCondition.getOrderBy());
                 importTaskAMVO.setOrderByType(importTaskCondition.getOrderByType());
-
+                importTaskAMVO.setProjectType(importTaskCondition.getProjectType());
             }
             ProgressVO progressVO = new ProgressVO();
             progressVO.setState(0);