浏览代码

事务信息传值接口的修改 改为Map类型数据

沈永艺 3 年之前
父节点
当前提交
0a9df04428

+ 3 - 1
PAS/src/main/java/cn/cslg/pas/domain/PatentAffair.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.swing.text.html.ObjectView;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -62,7 +64,7 @@ public class PatentAffair extends BaseEntity<PatentAffair> {
     private String createSimpleStatus;
     private String createSimpleStatus;
 
 
     @TableField(exist = false)
     @TableField(exist = false)
-    private List<INPADOC> inpadoc;
+    private List<Map<String, Object>> inpadoc;
 
 
     @Data
     @Data
     public static class INPADOC {
     public static class INPADOC {

+ 7 - 8
PAS/src/main/java/cn/cslg/pas/service/PatentAffairService.java

@@ -16,9 +16,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -44,15 +42,16 @@ public class PatentAffairService extends ServiceImpl<PatentAffairMapper, PatentA
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList(Constants.PATENT_STATUS, Constants.PATENT_SIMPLE_STATUS));
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList(Constants.PATENT_STATUS, Constants.PATENT_SIMPLE_STATUS));
         dataList.forEach(item -> {
         dataList.forEach(item -> {
             List<String> splitStr = StringUtils.changeStringToString(item.getContent(), "\\|");
             List<String> splitStr = StringUtils.changeStringToString(item.getContent(), "\\|");
-            List<PatentAffair.INPADOC> lst = new ArrayList<>();
+            List<Map<String, Object>> lst = new ArrayList<>();
 
 
             for (int i = 0; i < splitStr.size(); i += 3) {
             for (int i = 0; i < splitStr.size(); i += 3) {
                 PatentAffair.INPADOC inpadoc = new PatentAffair.INPADOC();
                 PatentAffair.INPADOC inpadoc = new PatentAffair.INPADOC();
-                inpadoc.setYear(splitStr.get(i).trim());
-                inpadoc.setContent(splitStr.get(i + 1).trim());
-                inpadoc.setCountry(splitStr.get(i + 2).trim());
+                Map<String, Object> map = new HashMap<>();
+                map.put("发生日期", splitStr.get(i).trim());
+                map.put("国家", splitStr.get(i + 2).trim());
+                map.put("内容", splitStr.get(i + 1).trim());
 
 
-                lst.add(inpadoc);
+                lst.add(map);
             }
             }
             item.setInpadoc(lst);
             item.setInpadoc(lst);
             item.setCreateTime(DateUtils.formatDate(item.getDateTime(), DateUtils.YYYY_MM_DD));
             item.setCreateTime(DateUtils.formatDate(item.getDateTime(), DateUtils.YYYY_MM_DD));