From 684d5ea5d90a5500d87ae615d886cd630ae4cb42 Mon Sep 17 00:00:00 2001
From: "logic.fang" <[logic.fang@estsh.com]>
Date: Wed, 24 Jul 2024 11:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=9C=8B=E6=9D=BF-"=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=97=B6=E5=AE=8C=E5=B7=A5=E7=8E=87"?=
 =?UTF-8?q?=E4=B8=8E"=E4=BA=A7=E7=BA=BF=E4=B8=80=E6=AC=A1=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=BF=E5=90=88=E6=A0=BC=E7=8E=87"=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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<String, Map<String, String>> getLastHoursTimeZoneMap(Integer designatedQuantity) {
-        Map<String, Map<String, String>> timeZoneMap = new TreeMap<>();
+        Map<String, Map<String, String>> 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<String, Map<String, String>> collectResult = new LinkedHashMap<>();
+        ListIterator<Map.Entry> i = new ArrayList<Map.Entry>(timeZoneMap.entrySet()).listIterator(timeZoneMap.size());
+        while (i.hasPrevious()) {
+            Map.Entry entry = i.previous();
+            collectResult.put(String.valueOf(entry.getKey()), (HashMap<String, String>) entry.getValue());
+        }
+        return collectResult;
     }
 
 }