2022-8-11 事务信息调整

PAS/src/main/java/cn/cslg/pas/common/utils/handler/PatSnapPatentAffairHandler.java

@@ -15,6 +15,9 @@ public class PatSnapPatentAffairHandler implements IProcessData {
         StringBuilder all = new StringBuilder();
         StringBuilder one = new StringBuilder();
         for (int i = 0; i < splitStr.size(); i += 3) {
+            if (splitStr.size() % 3 != 0) {
+                continue;
+            }
             if (one.toString().equals("")) {
                 one = new StringBuilder("\"inpadocData\"" + ":[" + "{" + "\"name\"" + ":" + "\"发生日期\"" + "," + "\"content\"" + ":" + "\"" + splitStr.get(i).trim() + "\"" + "}");
             } else {

PAS/src/main/java/cn/cslg/pas/common/utils/handler/PatenticsPatentAffairHandler.java

@@ -21,17 +21,29 @@ public class PatenticsPatentAffairHandler implements IProcessData {
         StringBuilder all = new StringBuilder();
         StringBuilder one = new StringBuilder();
         List<String> messageList;
-        Pattern p = Pattern.compile("[0-9]*");
-
+        Pattern p = Pattern.compile("[\\d]*");
+        int flag1 = 0;
         for (int j = 0; j < processList.size(); j++) {
             if (j < processList.size() - 1) {
-                Matcher m = p.matcher(processList.get(j + 1).substring(0, 2));
+                Matcher m = p.matcher(processList.get(j).substring(0, 4));
+                if (m.matches()) {
+                    flag1 = j;
+                }
                 if (!m.matches()) {
-                    processList.set(j, processList.get(j) + " " + processList.get(j + 1));
-                    processList.remove(j + 1);
+                    String replace = processList.get(j).replaceAll("\\|", " ");
+                    processList.set(flag1, processList.get(flag1) + "<br>" + replace);
                 }
             }
-            messageList = StringUtils.changeStringToString(processList.get(j), "\\|");
+        }
+
+        for (String s : processList) {
+            messageList = StringUtils.changeStringToString(s, "\\|");
+
+            if (messageList.size() == 4 && messageList.contains("授权")) {
+                messageList.remove(0);
+            } else if (messageList.size() % 3 != 0) {
+                continue;
+            }
 
             for (int i = 0; i < messageList.size(); i += 3) {
                 if (one.toString().equals("")) {

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

@@ -48,20 +48,26 @@ public class PatentAffairService extends ServiceImpl<PatentAffairMapper, PatentA
         List<PatentAffair> dataList = this.list(queryWrapper);
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList(Constants.PATENT_STATUS, Constants.PATENT_SIMPLE_STATUS));
         dataList.forEach(item -> {
-            List<KeyValueVO> lst = JsonUtils.jsonToList(item.getContent(), KeyValueVO.class);
-            KeyValueVO flag;
-            for (int i = 0; i < Objects.requireNonNull(lst).size() - 1; i++) {
-                for (int j = 0; j < lst.size() - i - 1; j++) {
-                    if (DateUtils.strToDate(lst.get(j).getInpadocData().get(0).getContent()).compareTo(DateUtils.strToDate(lst.get(j + 1).getInpadocData().get(0).getContent())) < 0) {
-                        flag = lst.get(j);
-                        lst.set(j, lst.get(j + 1));
-                        lst.set(j + 1, flag);
+            if (item.getContent() != null) {
+                List<KeyValueVO> lst = JsonUtils.jsonToList(item.getContent(), KeyValueVO.class);
+                KeyValueVO flag;
+                for (int i = 0; i < Objects.requireNonNull(lst).size() - 1; i++) {
+                    for (int j = 0; j < lst.size() - i - 1; j++) {
+                        if (DateUtils.strToDate(lst.get(j).getInpadocData().get(0).getContent()).compareTo(DateUtils.strToDate(lst.get(j + 1).getInpadocData().get(0).getContent())) < 0) {
+                            flag = lst.get(j);
+                            lst.set(j, lst.get(j + 1));
+                            lst.set(j + 1, flag);
+                        }
                     }
                 }
+                item.setInpadoc(lst);
             }
-            item.setInpadoc(lst);
+            Patent patent = patentService.getById(item.getPatentId());
+
             item.setCreateTime(DateUtils.formatDate(item.getDateTime(), DateUtils.YYYY_MM_DD));
-            item.setCreateSimpleStatus(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_SIMPLE_STATUS) && systemDict.getValue().equals(String.valueOf(item.getSimpleStatus()))).findFirst().orElse(new SystemDict()).getLabel());
+            if (patent != null) {
+                item.setCreateSimpleStatus(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_SIMPLE_STATUS) && systemDict.getValue().equals(String.valueOf(patent.getSimpleStatus()))).findFirst().orElse(new SystemDict()).getLabel());
+            }
             item.setCreateStatus(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_STATUS) && systemDict.getValue().equals(String.valueOf(item.getStatus()))).findFirst().orElse(new SystemDict()).getLabel());
         });