diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java index 9cb0b95..951251e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java @@ -416,7 +416,7 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { * @return 当前时间前指定小时数内的每个小时区间的开始与结束时间 */ private Map> getLastHoursTimeZoneMap(Integer designatedQuantity) { - Map> timeZoneMap = new TreeMap<>(); + Map> timeZoneMap = new LinkedHashMap<>(); DateTimeFormatter hourFormatter = DateTimeFormatter.ofPattern("HH"); DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd "); LocalDateTime nowTime = LocalDateTime.now(); @@ -450,7 +450,14 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { timeZoneMap.put(START_TIME, map); } } - return timeZoneMap; + //倒序处理 + Map> collectResult = new LinkedHashMap<>(); + ListIterator i = new ArrayList(timeZoneMap.entrySet()).listIterator(timeZoneMap.size()); + while (i.hasPrevious()) { + Map.Entry entry = i.previous(); + collectResult.put(String.valueOf(entry.getKey()), (HashMap) entry.getValue()); + } + return collectResult; } }