Skip to content

Commit 3b0af1c

Browse files
committed
Query monitoring history by certain date with sorted order
1 parent be19364 commit 3b0af1c

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/main/java/root/core/usecase/implement/ReportUsecaseImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.Comparator;
5+
import java.util.LinkedHashMap;
56
import java.util.List;
67
import java.util.Locale;
78
import java.util.Map;
@@ -52,7 +53,9 @@ public <T extends MonitoringResult> Map<String, List<T>> getMonitoringReportData
5253
return getMonitoringReportData(clazz, alias, unit, round)
5354
.stream()
5455
.filter(m -> inquiryDate.equals(m.getMonitoringDate()))
55-
.collect(Collectors.groupingBy(m -> m.getMonitoringDateTime(),
56+
.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime))
57+
.collect(Collectors.groupingBy(MonitoringResult::getMonitoringDateTime,
58+
LinkedHashMap::new,
5659
Collectors.mapping(m -> m, Collectors.toList())));
5760
}
5861

@@ -141,6 +144,7 @@ public <T extends MonitoringResult> Map<Integer, List<String>> getMonitoringRepo
141144
.stream()
142145
.collect(Collectors.groupingBy(
143146
m -> Integer.parseInt(DateUtils.convertDateFormat("yyyyMMddHHmmss", "HH", m, Locale.KOREA)),
147+
LinkedHashMap::new,
144148
Collectors.mapping(m -> m, Collectors.toList())));
145149

146150
for (int i = 0; i < 24; i++) {

0 commit comments

Comments
 (0)