2/2 导入修改

src/main/java/cn/cslg/pas/common/vo/invalidVO/QueryEvidenceReasonVO.java

@@ -17,7 +17,7 @@ public class QueryEvidenceReasonVO {
     private String evidenceText;
     private String evidenceDescription;
     private Integer evidenceReasonId;
-
+    private  Integer featureGen;
     private List<CompareLiterature> literatures;
     private List<AssoGroupFeature> featureHistories;
     /**

src/main/java/cn/cslg/pas/service/ReportExportService.java

@@ -268,13 +268,12 @@ public class ReportExportService {
         PictureRenderData pictureRenderData = null;
         byte[] bytes = null;
 
-        if (bytes != null) {
             try {
                 bytes = fileManagerService.downloadSystemFileFromFMS(guid);
             } catch (Exception e) {
 
             }
-        }
+
         FileInputStream fileInputStream = FileUtils.byteToFile(bytes);
         pictureRenderData = Pictures.ofStream(fileInputStream, PictureType.PNG)
                 .create();

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

@@ -506,7 +506,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
         List<EsCustomFieldValueDTO> esCustomFieldDTOS = new ArrayList<>();
         //根据名称获得标引栏位以及标引值
         LambdaQueryWrapper<CustomField> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(CustomField::getType, Arrays.asList(4, 5, 6))
+        queryWrapper.in(CustomField::getType, Arrays.asList(4, 5))
                 .eq(CustomField::getProjectId, projectId);
         List<CustomField> customFields = this.list(queryWrapper);
         List<Integer> ids = customFields.stream().map(CustomField::getId).collect(Collectors.toList());
@@ -518,12 +518,6 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
         optionWrapper.eq(CustomOption::getName, name)
                 .in(CustomOption::getCustomFieldId, ids);
         List<CustomOption> options = customOptionService.list(optionWrapper);
-        // 从 treeNode 查询名称相同的节点
-        LambdaQueryWrapper<TreeNode> treeNodeWrapper = new LambdaQueryWrapper<>();
-        treeNodeWrapper.eq(TreeNode::getName, name)
-                .eq(TreeNode::getType, 4)
-                .in(TreeNode::getTypeId, ids);
-        List<TreeNode> treeNodes = treeNodeService.list(treeNodeWrapper);
 
         if (options != null && options.size() != 0) {
             options.forEach(item -> {
@@ -532,32 +526,18 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
                                 .equals(item.getCustomFieldId()))
                         .findFirst().orElse(null);
                 if (esCustomFieldDTO == null) {
+                    esCustomFieldDTO =new EsCustomFieldValueDTO();
                     esCustomFieldDTO.setFieldId(item.getCustomFieldId().toString());
                     List<String> values = new ArrayList<>();
                     values.add(item.getId().toString());
                     esCustomFieldDTO.setFieldValue(values);
+                    esCustomFieldDTOS.add(esCustomFieldDTO);
                 } else {
                     esCustomFieldDTO.getFieldValue().add(item.getId().toString());
                 }
             });
         }
 
-        if (treeNodes != null && treeNodes.size() != 0) {
-            treeNodes.forEach(item -> {
-                EsCustomFieldValueDTO esCustomFieldDTO = esCustomFieldDTOS.stream()
-                        .filter(i -> i.getFieldId()
-                                .equals(item.getTypeId()))
-                        .findFirst().orElse(null);
-                if (esCustomFieldDTO == null) {
-                    esCustomFieldDTO.setFieldId(item.getTypeId().toString());
-                    List<String> values = new ArrayList<>();
-                    values.add(item.getId().toString());
-                    esCustomFieldDTO.setFieldValue(values);
-                } else {
-                    esCustomFieldDTO.getFieldValue().add(item.getId().toString());
-                }
-            });
-        }
         return esCustomFieldDTOS;
     }
 

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

@@ -906,14 +906,17 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
         List<CompareMessageVO> compareMessageVOS = new ArrayList<>();
         if (tortCompareRecordVO != null) {
             List<TortRightVO> tortRightVOS = tortCompareRecordVO.getTortRightVOS();
-
-            for (TortRightVO item : tortRightVOS) {
-                compareMessageVOS.addAll((item.getCompareMessageVOS()));
-                if (item.getType().equals(0)) {
-                    mainRightNum++;
-                }
-                rightNum++;
-            }
+         if(tortRightVOS!=null) {
+             for (TortRightVO item : tortRightVOS) {
+                 if (item.getCompareMessageVOS() != null && item.getCompareMessageVOS().size() > 0) {
+                     compareMessageVOS.addAll((item.getCompareMessageVOS()));
+                 }
+                 if (item.getType().equals(0)) {
+                     mainRightNum++;
+                 }
+                 rightNum++;
+             }
+         }
         }
         map.put("compareMessageVOs", compareMessageVOS);
         map.put("rightNum", rightNum);
@@ -923,12 +926,13 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
 
     /**
      * 从FTO中获得对比结果，并复制保存
+     *
      * @param projectId
-     * @param taskId 有可能是协同任务id
+     * @param taskId    有可能是协同任务id
      * @param createId
      * @param patentNos
      */
-    public void copyFTOCompareRecords(Integer projectId, Integer taskId, String createId, List<String> patentNos){
+    public void copyFTOCompareRecords(Integer projectId, Integer taskId, String createId, List<String> patentNos) {
         //判断参数不为空
         if (projectId != null && taskId != null) {
             patentNos.forEach(patentNo -> {
@@ -967,11 +971,12 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
 
     /**
      * 根据projectId和patentNo从对比结果表中查询最终结果，肯定不为空！
+     *
      * @param projectId
      * @param patentNo
      * @return
      */
-    public Integer getLastTaskIdFromRecords(Integer projectId, String patentNo){
+    public Integer getLastTaskIdFromRecords(Integer projectId, String patentNo) {
         //根据报告id和专利号查询最新的对比结果的任务id
         LambdaQueryWrapper<FTOCompareRecord> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
@@ -990,12 +995,13 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
 
     /**
      * 查询最新对比结果
+     *
      * @param projectId
      * @param patentNo
      * @param taskId
      * @return
      */
-    public List<FTOCompareRecord> getLastFTORecord(Integer projectId, String patentNo, Integer taskId){
+    public List<FTOCompareRecord> getLastFTORecord(Integer projectId, String patentNo, Integer taskId) {
         LambdaQueryWrapper<FTOCompareRecord> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                 .eq(FTOCompareRecord::getProjectId, projectId)
@@ -1009,11 +1015,12 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
 
     /**
      * 根据两个参数查询splitId
+     *
      * @param projectId
      * @param patentNo
      * @return
      */
-    public Integer getSplitId(Integer projectId, String patentNo, Integer taskId){
+    public Integer getSplitId(Integer projectId, String patentNo, Integer taskId) {
         //根据报告id和专利号查询最新的对比结果的任务id
         LambdaQueryWrapper<PatentSplitMessage> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
@@ -1031,13 +1038,13 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
         return splitId;
     }
 
-    public Integer getAssoTaskId(String patentNo, Integer assitTaskId){
+    public Integer getAssoTaskId(String patentNo, Integer assitTaskId) {
         LambdaQueryWrapper<FTOCompareRecord> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(FTOCompareRecord::getCompareFileNumber, patentNo)
                 .eq(FTOCompareRecord::getProjectTaskId, assitTaskId)
                 .eq(FTOCompareRecord::getIfOriginal, true);
-        FTOCompareRecord ftoCompareRecord = this.getOne(queryWrapper ,false);
+        FTOCompareRecord ftoCompareRecord = this.getOne(queryWrapper, false);
         Integer assoTaskId = ftoCompareRecord.getAssoTaskId();
-        return  assoTaskId;
+        return assoTaskId;
     }
 }

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

@@ -81,7 +81,9 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
 
         //查询拆分下的权要
         List<RePatentClaim> patentRights = this.getRightListByNo(patentNo);
-
+        if(patentRights.size()==0){
+            return new ArrayList<>();
+        }
         LambdaQueryWrapper<PatentSplitMessage> splitWrapper = new LambdaQueryWrapper<>();
         splitWrapper.eq(PatentSplitMessage::getPatentNo, patentNo);
         splitWrapper.eq(PatentSplitMessage::getProjectId, projectId);
@@ -116,6 +118,8 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
                 }
                 patentSplitMessage.insert();
                 allFeatures = this.splitFeature(splitBy, splitType, patentNo, projectId, taskId, patentRights, patentSplitMessage.getId());
+
+
             }
         }
         //当重拆时新建

src/main/java/cn/cslg/pas/service/business/invalidReport/EvidenceReasonService.java

@@ -208,6 +208,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
             assoGroupFeatures.forEach(assoGroupFeature -> {
                 //查询特征
                 Integer featureId = assoGroupFeature.getFeatureId();
+                Integer featureGen =assoGroupFeature.getFeatureGen();
                 //根据特征id查询特征
                 Feature feature = featureService.getById(featureId);
                 Integer featureGroupId = assoGroupFeature.getId();
@@ -256,7 +257,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                         queryEvidenceReasonVO.setGroupId(groupId);
                         queryEvidenceReasonVO.setFeatureGroupId(featureGroupId);
                         queryEvidenceReasonVO.setFeatureHistories(queryFeatureHistories);
-
+                        queryEvidenceReasonVO.setFeatureGen(featureGen);
                         //装载特征陈述信息
                         queryEvidenceReasonVO.setFeCommon(item.getCommon());
                         queryEvidenceReasonVO.setFeIfPresentOpinions1(item.getIfPresentOpinions1());

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

@@ -759,10 +759,6 @@ public class ImportSinglePatentService {
             esService.addEsLegalEvent(patentNo);
         }
 
-        if (!ObjectUtils.isEmpty(patent)) {
-            esService.updatePatentShouldWait(patent, patentWithIdVO.getId());
-
-        }
         //装载权利要求
         if (contents.contains(2) || contents.contains(3)) {
             this.getFullXmlStr(patent, starPatentVO, contents);
@@ -771,6 +767,11 @@ public class ImportSinglePatentService {
 
             }
         }
+        if (!ObjectUtils.isEmpty(patent)) {
+            esService.updatePatentShouldWait(patent, patentWithIdVO.getId());
+
+        }
+
         return true;
     }
 

src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   servlet:
     context-path: /
-  port: 8879
+  port: 8877
 #  sa-token:
 #  activity-timeout: 18000
 #  token-name: token
@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: testNetIn
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization: