5/27 修改专利导入

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

@@ -1,8 +1,6 @@
 package cn.cslg.pas.common.vo;
 
 
-
-
 import cn.cslg.pas.common.model.importTaskModel.*;
 import cn.cslg.pas.domain.es.Patent;
 import lombok.Data;
@@ -10,6 +8,7 @@ import lombok.experimental.Accessors;
 import org.apache.poi.ss.usermodel.PictureData;
 
 import java.util.List;
+
 /**
  * @author 沈永艺
  * @date 2022/7/1
@@ -139,5 +138,9 @@ public class UploadParamsVO {
     private PictureData pictureData;
 
 
+    private List<String> priorityCountry;
+
+    private List<String> priorityNo;
+    private List<String> priorityDate;
 
 }

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

@@ -396,10 +396,13 @@ public class GetCataloguingFromWebThread extends Thread {
                 }
             }
             //装载优先权号、优先权国家、优先权日
-            if (patent.getPriorities() == null && chinaPatentZhuLu.getPR() != null && chinaPatentZhuLu.getPR() != "") {
+            if (chinaPatentZhuLu.getPR() != null && chinaPatentZhuLu.getPR() != "") {
                 String pr = chinaPatentZhuLu.getPR();
-                String prStrs[] = pr.split(" ");
+                String[] prStrs = pr.split(" ");
                 String priorityNo = prStrs[0];
+                if(chinaPatentZhuLu.getPRD()!=null){
+
+                }
                 String prDate = "";
                 if (prStrs.length > 1) {
                     prDate = prStrs[1];

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

@@ -11,10 +11,7 @@ import cn.cslg.pas.common.vo.ImportTaskAMVO;
 import cn.cslg.pas.common.vo.PatentData;
 import cn.cslg.pas.common.vo.UploadParamsVO;
 import cn.cslg.pas.common.vo.UploadSettingVO;
-import cn.cslg.pas.domain.es.Patent;
-import cn.cslg.pas.domain.es.PatentClassify;
-import cn.cslg.pas.domain.es.PatentPerson;
-import cn.cslg.pas.domain.es.Text;
+import cn.cslg.pas.domain.es.*;
 import cn.cslg.pas.service.business.CustomFieldService;
 import cn.cslg.pas.service.business.es.EsService;
 import cn.cslg.pas.service.common.ExcuteDataToVOService;
@@ -333,6 +330,27 @@ public class GetPatentFromExcelThread extends Thread {
             }
         }
 
+        //装载优先权
+      if(uploadParamsVO.getPriorityNo()!=null&&uploadParamsVO.getPriorityNo().size()>0){
+          List<String> prDates =uploadParamsVO.getPriorityDate();
+          List<Priorities> priorities =new ArrayList<>();
+          for(int i=0;i<uploadParamsVO.getPriorityNo().size();i++)
+          {
+              String prNo =uploadParamsVO.getPriorityNo().get(i);
+
+                  Priorities prioritie = new Priorities();
+                  prioritie.setPriorityNo(prNo);
+                  String pCountry = prNo.substring(0, 2);
+                  prioritie.setPriorityCountry(pCountry);
+                  if(prDates!=null&&prDates.size()>i){
+                      prioritie.setPriorityDate(prDates.get(i));}
+              priorities.add(prioritie);
+          }
+
+          patent.setPriorities(priorities);
+
+      }
+
     }
 
 

src/main/resources/application-dev.yml

@@ -61,12 +61,12 @@ spring:
     #初始化表结构
     jdbc:
       initialize-schema: always
-authorUrl: http://localhost:8871
-PCSUrl: http://localhost:8871
+authorUrl: http://localhost:8885
+PCSUrl: http://localhost:8885
 #OPSUrl: http://192.168.2.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8879
-FMSUrl: http://localhost:8885
+FMSUrl: http://localhost:8803
 FileSource: 1
 ES:
   patentVector: patent_vector