From 15e230babb6c945971fcd7ccde1ef7a6c99e6a24 Mon Sep 17 00:00:00 2001 From: mashili Date: Mon, 1 Sep 2025 16:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xzzn/ems/service/impl/HomePageServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java index 26e039b..03a8a62 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java @@ -28,8 +28,6 @@ public class HomePageServiceImpl implements IHomePageService @Autowired private IEmsSiteService emsSiteService; @Autowired - private EmsPcsDataMapper emsPcsDataMapper; - @Autowired private EmsSiteSettingMapper emsSiteMapper; @Autowired private EmsAlarmRecordsMapper alarmRecordsMapper; @@ -240,8 +238,10 @@ public class HomePageServiceImpl implements IHomePageService electricIndexList.setDisChargeEnergy(totalDisChargeData); elecDataMap.put(dataMonth,electricIndexList); } - - electricDataList = elecDataMap.values().stream().collect(Collectors.toList()); + // 按月份升序排序后返回 + electricDataList = elecDataMap.values().stream() + .sorted(Comparator.comparing(ElectricIndexList::getDateMonth)) + .collect(Collectors.toList()); return electricDataList; } // 从timeRangeList中获取指定站点+月份的时间范围