xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +24061 -996
218 changed files with 24061 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 15e230babb - Show all commits

8
ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java
View File

@ -28,8 +28,6 @@ public class HomePageServiceImpl implements IHomePageService
@Autowired @Autowired
private IEmsSiteService emsSiteService; private IEmsSiteService emsSiteService;
@Autowired @Autowired
private EmsPcsDataMapper emsPcsDataMapper;
@Autowired
private EmsSiteSettingMapper emsSiteMapper; private EmsSiteSettingMapper emsSiteMapper;
@Autowired @Autowired
private EmsAlarmRecordsMapper alarmRecordsMapper; private EmsAlarmRecordsMapper alarmRecordsMapper;
@ -240,8 +238,10 @@ public class HomePageServiceImpl implements IHomePageService
electricIndexList.setDisChargeEnergy(totalDisChargeData); electricIndexList.setDisChargeEnergy(totalDisChargeData);
elecDataMap.put(dataMonth,electricIndexList); 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; return electricDataList;
} }
// 从timeRangeList中获取指定站点+月份的时间范围 // 从timeRangeList中获取指定站点+月份的时间范围