From 167236d51d359745c6abe0b6ed827b2ff7d37a4b Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 17 六月 2025 17:39:42 +0800
Subject: [PATCH] 领导层首页-运行监控界面
---
src/main/java/com/whyc/service/LeaderHomeService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/LeaderHomeService.java b/src/main/java/com/whyc/service/LeaderHomeService.java
index e03a970..1281442 100644
--- a/src/main/java/com/whyc/service/LeaderHomeService.java
+++ b/src/main/java/com/whyc/service/LeaderHomeService.java
@@ -1,6 +1,5 @@
package com.whyc.service;
-import com.sun.org.glassfish.gmbal.NameValue;
import com.whyc.constant.BattSingalIdEnum;
import com.whyc.constant.Capperformance;
import com.whyc.constant.DevAlarmEnum;
@@ -176,7 +175,7 @@
private void alarmRealtimeStatistics(Integer userId, Map<String, Object> map) {
//鐢垫睜鍛婅淇℃伅缁熻
List<AlarmDto> battAlarmListNew = new ArrayList<>();
- List<AlarmDto> battAlarmList = battAlarmService.getListByUserId(userId);
+ List<AlarmDto> battAlarmList = battAlarmService.getListByUserId(userId, null);
//鍚堝苟鍗曚綋鍛婅鐨勫憡璀︿俊鎭�,瀵笰larmDto涓瑼lmId 鍦�17~28涔嬮棿鐨勮繘琛屽悎骞�.
Map<String, List<AlarmDto>> mergeMap = battAlarmList.stream()
.filter(alarm -> alarm.getAlmId() >= 17 && alarm.getAlmId() <= 28)
@@ -205,7 +204,7 @@
});
//璁惧鍛婅淇℃伅缁熻
- List<AlarmDto> devAlarmList = devAlarmService.getListByUserId(userId);
+ List<AlarmDto> devAlarmList = devAlarmService.getListByUserId(userId,null);
//瀵瑰憡璀﹀悕绉拌祴鍊�
devAlarmList.forEach(alarmDto -> {
alarmDto.setAlmName(DevAlarmEnum.getValue(alarmDto.getAlmId()));
@@ -213,7 +212,7 @@
//鐢垫簮鍛婅淇℃伅缁熻
List<AlarmDto> powerAlarmListNew = new ArrayList<>();
- List<AlarmDto> powerAlarmList = powerAlarmService.getListByUserId(userId);
+ List<AlarmDto> powerAlarmList = powerAlarmService.getListByUserId(userId,null);
//鏁存祦鍣ㄦ�绘晠闅滃悎骞�
//ALARM_3300001(3300001,"鏁存祦鍣�1鎬绘晠闅滃憡璀�"),
// ALARM_3300002(3300002,"鏁存祦鍣�2鎬绘晠闅滃憡璀�"),
@@ -689,7 +688,7 @@
}
- private void testDataInfoStatistics(Integer userId, Map<String, Object> map) {
+ protected void testDataInfoStatistics(Integer userId, Map<String, Object> map) {
List<BatttestdataInf> testInfList = battTestDataInfService.getListByUserId(userId);
//杩囨护鍑烘湰鏈堢殑
LocalDateTime startOfMonth = DateUtil.getStartOfMonth();
@@ -766,7 +765,7 @@
return testInfOfMonth;
}
- private void batteryInfoStatistics(Integer userId, Map<String, Object> map) {
+ protected void batteryInfoStatistics(Integer userId, Map<String, Object> map) {
List<BattInf> battInfList = battInfService.getListByUserId(userId);
Map<String, List<BattInf>> brandMap = battInfList.stream().collect(Collectors.groupingBy(BattInf::getProduct));
Map<Float, List<BattInf>> volMap = battInfList.stream().collect(Collectors.groupingBy(BattInf::getMonvolstd));
@@ -786,7 +785,7 @@
map.put("battGroupInfo_vol",volList);
}
- private void powerInfoStatistics(Integer userId, Map<String, Object> map) {
+ protected void powerInfoStatistics(Integer userId, Map<String, Object> map) {
List<PowerInf> powerInfList = powerInfService.getListByUserId(userId);
Map<String, List<PowerInf>> brandMap = powerInfList.stream().collect(Collectors.groupingBy(PowerInf::getCompany));
Map<Integer, List<PowerInf>> typeMap = powerInfList.stream().collect(Collectors.groupingBy(PowerInf::getPowerType));
--
Gitblit v1.9.1