5/27 修改专利导入

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

@@ -399,9 +399,9 @@ public class ReportExportService {
                     //同族专利
                     try {
                         //装载同族信息
-                        List<Map<String, Object>> familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "inpadoc");
+                        List<Map<String, Object>> familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "simple");
                         if (familyMaps.size() <= 0) {
-                            familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "simple");
+                            familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "inpadoc");
                         }
                         if (familyMaps != null && familyMaps.size() > 0) {
                             Map<String, Object> familyMap = familyMaps.get(0);

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

@@ -103,7 +103,7 @@ public class GetCataloguingFromWebThread extends Thread {
                 List<String> familyPatentNos = new ArrayList<>();
                 if (!familyPatentNoStr.equals("no data") && !familyPatentNoStr.trim().equals("")) {
                     FamilyPatentNo familyPatentNo = JSON.parseObject(familyPatentNoStr, FamilyPatentNo.class);
-                    if (familyPatentNo != null &&familyPatentNo.getFamilyinfo() != null&& !familyPatentNo.getFamilyinfo().trim().equals("")) {
+                    if (familyPatentNo != null && familyPatentNo.getFamilyinfo() != null && !familyPatentNo.getFamilyinfo().trim().equals("")) {
                         String[] nos = familyPatentNo.getFamilyinfo().split(";");
                         if (nos != null && nos.length > 0) {
                             for (String no : nos) {
@@ -333,14 +333,19 @@ public class GetCataloguingFromWebThread extends Thread {
 
         //装载优先权
         if (starPatentVO.getPriorityNo() != null && !starPatentVO.getPriorityNo().equals("")) {
+            String pr = starPatentVO.getPriorityNo();
+            String prStrs[] = pr.split(" ");
+            String priorityNo = prStrs[0];
+            String prDate = "";
+            if (prStrs.length > 1) {
+                prDate = prStrs[1];
+            }
             Priorities priorities = new Priorities();
-            priorities.setPriorityNo(starPatentVO.getPriorityNo());
-            String pCountry = starPatentVO.getApplicationNo().substring(0, 2);
+            priorities.setPriorityNo(priorityNo);
+            String pCountry = priorityNo.substring(0, 2);
             priorities.setPriorityCountry(pCountry);
             //装载优先权日
-            if (starPatentVO.getPriorityDate() != null && !starPatentVO.getPriorityDate().equals("")) {
-                DateUtils.str2Date(starPatentVO.getPriorityDate());
-            }
+            priorities.setPriorityDate(prDate);
             patent.setPriorities(Arrays.asList(priorities));
         }
 
@@ -392,11 +397,21 @@ public class GetCataloguingFromWebThread extends Thread {
             }
             //装载优先权号、优先权国家、优先权日
             if (patent.getPriorities() == null && chinaPatentZhuLu.getPR() != null && chinaPatentZhuLu.getPR() != "") {
+                String pr = chinaPatentZhuLu.getPR();
+                String prStrs[] = pr.split(" ");
+                String priorityNo = prStrs[0];
+                String prDate = "";
+                if (prStrs.length > 1) {
+                    prDate = prStrs[1];
+                }
                 Priorities priorities = new Priorities();
-                priorities.setPriorityNo(chinaPatentZhuLu.getPR());
-                String pCountry = chinaPatentZhuLu.getPR().substring(0, 2);
+                priorities.setPriorityNo(priorityNo);
+                String pCountry = priorityNo.substring(0, 2);
                 priorities.setPriorityCountry(pCountry);
+                //装载优先权日
+                priorities.setPriorityDate(prDate);
                 patent.setPriorities(Arrays.asList(priorities));
+
             }
 
         }
@@ -492,10 +507,20 @@ public class GetCataloguingFromWebThread extends Thread {
 
         //装载优先权号、优先权国家、优先权日
         if (patent.getPriorities() == null && worldPatentZhuLu.getPr() != null && worldPatentZhuLu.getPr() != "") {
+
+            String pr = worldPatentZhuLu.getPr();
+            String prStrs[] = pr.split(" ");
+            String priorityNo = prStrs[0];
+            String prDate = "";
+            if (prStrs.length > 1) {
+                prDate = prStrs[1];
+            }
             Priorities priorities = new Priorities();
-            priorities.setPriorityNo(worldPatentZhuLu.getPr());
-            String pCountry = worldPatentZhuLu.getPr().substring(0, 2);
+            priorities.setPriorityNo(priorityNo);
+            String pCountry = priorityNo.substring(0, 2);
             priorities.setPriorityCountry(pCountry);
+            //装载优先权日
+            priorities.setPriorityDate(prDate);
             patent.setPriorities(Arrays.asList(priorities));
         }