系统字段调整 上传判空校验修改

PAS/src/main/java/cn/cslg/pas/common/utils/DataProcessHandler.java

@@ -1,14 +1,11 @@
 package cn.cslg.pas.common.utils;
 
-import com.alibaba.fastjson.JSON;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -195,20 +192,6 @@ class ProcessDataFactory {
         return null;
     }
 
-    public static void main(String[] args) {
-        IProcessData iProcessData = new PatSnapPatentAffairHandler();
-        String a = (String) iProcessData.processData("2022-03-01 | ENTRY INTO FORCE OF REQUEST FOR SUBSTANTIVE EXAMINATION | CN | 2022-02-11 | PUBLICATION | CN", null);
-        IProcessData iProcessDataB = new IncoPatPatentAffairHandler();
-        String b = (String) iProcessDataB.processData("法律状态公告日：20220607;\n" +
-                "法律状态：公开;\n" +
-                "描述信息：公开;\n" +
-                "法律状态公告日：20220624;\n" +
-                "法律状态：实质审查的生效;\n" +
-                "描述信息：实质审查的生效IPC(主分类):A61B1/06;\n", null);
-
-        System.out.println(JSON.parse(a));
-        System.out.println(JSON.parse(b));
-    }
 }
 
 

PAS/src/main/java/cn/cslg/pas/service/PatentApplicantService.java

@@ -1,15 +1,17 @@
 package cn.cslg.pas.service;
 
-import cn.cslg.pas.common.model.BaseEntity;
+import cn.cslg.pas.common.model.dto.AreaAddressDTO;
 import cn.cslg.pas.common.model.params.PatentApplicantAddressParams;
-import cn.cslg.pas.domain.*;
+import cn.cslg.pas.common.model.vo.PatentApplicantVO;
 import cn.cslg.pas.common.utils.DateUtils;
+import cn.cslg.pas.common.utils.PatentUtils;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.StringUtils;
-import cn.cslg.pas.common.model.vo.PatentApplicantVO;
+import cn.cslg.pas.domain.PatentApplicant;
+import cn.cslg.pas.domain.PatentApplicantLink;
+import cn.cslg.pas.domain.PatentApplicantMergeLink;
+import cn.cslg.pas.domain.SystemDict;
 import cn.cslg.pas.mapper.PatentApplicantMapper;
-import cn.cslg.pas.common.model.dto.AreaAddressDTO;
-import cn.cslg.pas.common.utils.PatentUtils;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

PAS/src/main/java/cn/cslg/pas/service/PatentFieldService.java

@@ -116,7 +116,7 @@ public class PatentFieldService {
             add(new PatentField("37-0", "专利类型", Constants.SYSTEM_FIELD_QUERY, 16));
             add(new PatentField("29-17", "申请人国家", Constants.SYSTEM_FIELD_QUERY, 17));
             add(new PatentField("29-18", "申请人地区", Constants.SYSTEM_FIELD_QUERY, 18));
-            add(new PatentField("36-0", "简单法律状态", Constants.SYSTEM_FIELD_QUERY, 19));
+            add(new PatentField("36-0", "专利状态", Constants.SYSTEM_FIELD_QUERY, 19));
             add(new PatentField("40-0", "法律事件", Constants.SYSTEM_FIELD_QUERY, 20));
             add(new PatentField("26-12", "公开年", Constants.SYSTEM_FIELD_QUERY, 21));
             add(new PatentField("54-0", "标签", Constants.SYSTEM_FIELD_QUERY, 22));
@@ -137,7 +137,7 @@ public class PatentFieldService {
             add(new PatentField("bureau", "受理局", Constants.SYSTEM_FIELD_EXPORT, 13));
             add(new PatentField("simplefamily", "简单同族", Constants.SYSTEM_FIELD_EXPORT, 14));
             add(new PatentField("inpadocfamily", "Inpadoc同族", Constants.SYSTEM_FIELD_EXPORT, 15));
-            add(new PatentField("patsnapfamily", "PatSnap同族", Constants.SYSTEM_FIELD_EXPORT, 15));
+            add(new PatentField("patsnapfamily", "扩展同族", Constants.SYSTEM_FIELD_EXPORT, 15));
             add(new PatentField("intclassno", "IPC主分类号", Constants.SYSTEM_FIELD_EXPORT, 16));
             add(new PatentField("ipc", "IPC分类号", Constants.SYSTEM_FIELD_EXPORT, 16));
             add(new PatentField("intclasscpcno", "CPC分类号", Constants.SYSTEM_FIELD_EXPORT, 17));
@@ -181,7 +181,7 @@ public class PatentFieldService {
             add(new PatentField("manual", "说明书", Constants.SYSTEM_FIELD_EXPORT, 49));
             add(new PatentField("simplefamilynum", "简单同族数量", Constants.SYSTEM_FIELD_EXPORT, 50));
             add(new PatentField("inpadocfamilynum", "Inpadoc同族数量", Constants.SYSTEM_FIELD_EXPORT, 51));
-            add(new PatentField("patsnapfamilynum", "PatSnap同族数量", Constants.SYSTEM_FIELD_EXPORT, 51));
+            add(new PatentField("patsnapfamilynum", "扩展同族数量", Constants.SYSTEM_FIELD_EXPORT, 51));
             add(new PatentField("quoteno", "引用专利数量", Constants.SYSTEM_FIELD_EXPORT, 52));
             add(new PatentField("quotedno", "被引用数量", Constants.SYSTEM_FIELD_EXPORT, 53));
             add(new PatentField("quotedno3", "三年内被引用数量", Constants.SYSTEM_FIELD_EXPORT, 54));
@@ -206,7 +206,7 @@ public class PatentFieldService {
             add(new PatentField("label", "标签", Constants.SYSTEM_FIELD_PATENT_LIST, 9));
             add(new PatentField("simpleFamily", "简单同族", Constants.SYSTEM_FIELD_PATENT_LIST, 10));
             add(new PatentField("inpadocFamily", "Inpadoc同族", Constants.SYSTEM_FIELD_PATENT_LIST, 11));
-            add(new PatentField("patSnapFamily", "PatSnap同族", Constants.SYSTEM_FIELD_PATENT_LIST, 11));
+            add(new PatentField("patSnapFamily", "扩展同族", Constants.SYSTEM_FIELD_PATENT_LIST, 11));
             add(new PatentField("ipcList", "IPC分类号", Constants.SYSTEM_FIELD_PATENT_LIST, 12));
             add(new PatentField("cpcList", "CPC分类号", Constants.SYSTEM_FIELD_PATENT_LIST, 13));
             add(new PatentField("upcList", "UPC分类号", Constants.SYSTEM_FIELD_PATENT_LIST, 14));

PAS/src/main/java/cn/cslg/pas/service/ProjectFieldService.java

@@ -495,7 +495,7 @@ public class ProjectFieldService extends ServiceImpl<ProjectFieldMapper, Project
         projectFieldList.add(this.buildProjectFieldEntity(33, "被引用专利数量", 94, 3));
         projectFieldList.add(this.buildProjectFieldEntity(34, "inpadoc同族数量", 94, 3));
         projectFieldList.add(this.buildProjectFieldEntity(35, "简单同族数量", 94, 3));
-        projectFieldList.add(this.buildProjectFieldEntity(55, "PatSnap同族数量", 94, 3));
+        projectFieldList.add(this.buildProjectFieldEntity(55, "扩展同族数量", 94, 3));
         projectFieldList.add(this.buildProjectFieldEntity(36, "法律状态", 95, 1));
         projectFieldList.add(this.buildProjectFieldEntity(37, "专利类型", 95, 1));
         projectFieldList.add(this.buildProjectFieldEntity(38, "权利要求数量", 95, 3));

PAS/src/main/java/cn/cslg/pas/service/UploadPatentBatchService.java

@@ -18,8 +18,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -150,11 +152,11 @@ public class UploadPatentBatchService {
         patentSimplyFamilyBusiness(uploadParamsVO);
         //发明人 OS_PATENT_INVENTOR
         patentInventorBusiness(uploadParamsVO);
-//        //申请人/权利人 OS_APPLICATION_ATTR
-//        //权利人
-//        patentCurrentApplicationBusiness(uploadParamsVO);
-//        //申请人
-//        patentOriginalApplicationBusiness(uploadParamsVO);
+        //申请人/权利人 OS_APPLICATION_ATTR
+        //权利人
+        patentCurrentApplicationBusiness(uploadParamsVO);
+        //申请人
+        patentOriginalApplicationBusiness(uploadParamsVO);
         //专题库关联专利信息 OS_THEMATIC_PID
         if (uploadParamsVO.getPatent() != null) {
             patentThematicPidBusiness(uploadParamsVO, projectImportPatentVO);
@@ -172,9 +174,7 @@ public class UploadPatentBatchService {
             patentLabelBusiness(uploadParamsVO, projectImportPatentVO);
         }
         //分类号关联 OS_PATENT_TYPENO
-        if (uploadParamsVO.getMainIpc() != null && uploadParamsVO.getMainUpc() != null && uploadParamsVO.getCpcList() != null && uploadParamsVO.getLocList() != null && uploadParamsVO.getUpcList() != null && uploadParamsVO.getIpcList() != null) {
-            patentTypeNoBusiness(uploadParamsVO);
-        }
+        patentTypeNoBusiness(uploadParamsVO);
         //事务信息 OS_PATENT_AFFAIR
         patentAffairBusiness(uploadParamsVO);
         //自定义字段
@@ -328,13 +328,25 @@ public class UploadPatentBatchService {
 
     private void patentTypeNoBusiness(UploadParamsVO uploadParamsVO) {
         PatentClassNumberParams patentClassNumberParams = new PatentClassNumberParams();
+        if (uploadParamsVO.getMainIpc() != null) {
+            patentClassNumberParams.setMainIpc(uploadParamsVO.getMainIpc());
+        }
+        if (uploadParamsVO.getMainUpc() != null) {
+            patentClassNumberParams.setMainUpc(uploadParamsVO.getMainUpc());
+        }
+        if (uploadParamsVO.getCpcList() != null) {
+            patentClassNumberParams.setCpcList(uploadParamsVO.getCpcList());
+        }
+        if (uploadParamsVO.getLocList() != null) {
+            patentClassNumberParams.setLocList(uploadParamsVO.getLocList());
+        }
+        if (uploadParamsVO.getUpcList() != null) {
+            patentClassNumberParams.setUpcList(uploadParamsVO.getUpcList());
+        }
+        if (uploadParamsVO.getIpcList() != null) {
+            patentClassNumberParams.setIpcList(uploadParamsVO.getIpcList());
+        }
         patentClassNumberParams.setPatentId(uploadParamsVO.getPatent().getId());
-        patentClassNumberParams.setCpcList(uploadParamsVO.getCpcList());
-        patentClassNumberParams.setIpcList(uploadParamsVO.getIpcList());
-        patentClassNumberParams.setLocList(uploadParamsVO.getLocList());
-        patentClassNumberParams.setIpcList(uploadParamsVO.getIpcList());
-        patentClassNumberParams.setMainIpc(uploadParamsVO.getMainIpc());
-        patentClassNumberParams.setMainUpc(uploadParamsVO.getMainUpc());
 
         patentClassNumberLinkService.updatePatentClassNumberLink(patentClassNumberParams);
     }