|
@@ -27,6 +27,7 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
|
|
@Autowired
|
|
@Autowired
|
|
private CenterEventCommandCenterMapper centerEventCommandCenterMapper;
|
|
private CenterEventCommandCenterMapper centerEventCommandCenterMapper;
|
|
|
|
|
|
|
|
+ private static final String NAME = "name";
|
|
private static final String NUMBER = "num";
|
|
private static final String NUMBER = "num";
|
|
private static final String UNPROCESSED = "unprocessed";
|
|
private static final String UNPROCESSED = "unprocessed";
|
|
private static final String PROCESSING = "processing";
|
|
private static final String PROCESSING = "processing";
|
|
@@ -129,7 +130,7 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
|
|
// 不要四平市
|
|
// 不要四平市
|
|
if (!SI_PING.equals(keys[0])) {
|
|
if (!SI_PING.equals(keys[0])) {
|
|
map = new HashMap<>();
|
|
map = new HashMap<>();
|
|
- map.put("name", keys[1]);
|
|
|
|
|
|
+ map.put(NAME, keys[1]);
|
|
map.put(NUMBER, entry.getValue());
|
|
map.put(NUMBER, entry.getValue());
|
|
map.put(UNPROCESSED, unprocessedMap.get(entry.getKey()));
|
|
map.put(UNPROCESSED, unprocessedMap.get(entry.getKey()));
|
|
map.put(PROCESSING, processingMap.get(entry.getKey()));
|
|
map.put(PROCESSING, processingMap.get(entry.getKey()));
|
|
@@ -219,19 +220,19 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
|
|
setSookaDataBase(centereventTDeptEvent);
|
|
setSookaDataBase(centereventTDeptEvent);
|
|
List<Map<String, Object>> result = centerEventCommandCenterMapper.getEventTrend(centereventTDeptEvent);
|
|
List<Map<String, Object>> result = centerEventCommandCenterMapper.getEventTrend(centereventTDeptEvent);
|
|
// 提取已存在的年-月
|
|
// 提取已存在的年-月
|
|
- List<String> originDate = result.stream().map(item -> MapUtils.getString(item, "name")).collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> originDate = result.stream().map(item -> MapUtils.getString(item, NAME)).collect(Collectors.toList());
|
|
// 获取不存在的年-月
|
|
// 获取不存在的年-月
|
|
int year = LocalDate.now().getYear();
|
|
int year = LocalDate.now().getYear();
|
|
List<String> newDate = Arrays.asList(year + "-01", year + "-02", year + "-03", year + "-04", year + "-05", year + "-06", year + "-07", year + "-08", year + "-09", year + "-10", year + "-11", year + "-12");
|
|
List<String> newDate = Arrays.asList(year + "-01", year + "-02", year + "-03", year + "-04", year + "-05", year + "-06", year + "-07", year + "-08", year + "-09", year + "-10", year + "-11", year + "-12");
|
|
newDate = newDate.stream().filter(o -> !originDate.contains(o)).collect(Collectors.toList());
|
|
newDate = newDate.stream().filter(o -> !originDate.contains(o)).collect(Collectors.toList());
|
|
newDate.forEach(date -> {
|
|
newDate.forEach(date -> {
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
- map.put("name", date);
|
|
|
|
|
|
+ map.put(NAME, date);
|
|
map.put("num", 0L);
|
|
map.put("num", 0L);
|
|
result.add(map);
|
|
result.add(map);
|
|
});
|
|
});
|
|
// 排序
|
|
// 排序
|
|
- Collections.sort(result, (o1, o2) -> MapUtils.getString(o1, "name").compareTo(MapUtils.getString(o2, "name")));
|
|
|
|
|
|
+ Collections.sort(result, (o1, o2) -> MapUtils.getString(o1, NAME).compareTo(MapUtils.getString(o2, NAME)));
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -242,7 +243,7 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
|
|
if (SI_PING.equals(String.valueOf(centereventTDeptEvent.getDeptId()))) {
|
|
if (SI_PING.equals(String.valueOf(centereventTDeptEvent.getDeptId()))) {
|
|
result = dataFilter(result);
|
|
result = dataFilter(result);
|
|
}
|
|
}
|
|
- return result;
|
|
|
|
|
|
+ return result.stream().filter(item -> StringUtils.isNotEmpty(MapUtils.getString(item, NAME))).collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|