|
@@ -16,9 +16,7 @@ import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
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;
|
|
|
|
|
|
/**
|
|
@@ -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));
|
|
|
dataList.forEach(item -> {
|
|
|
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) {
|
|
|
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.setCreateTime(DateUtils.formatDate(item.getDateTime(), DateUtils.YYYY_MM_DD));
|