From 486d3e4f633c95413bb642951b51fad68b8d337a Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 08 十二月 2023 11:34:53 +0800
Subject: [PATCH] 设备告警历史和统计
---
src/main/java/com/whyc/service/CKPowerDevAlarmHistoryService.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevAlarmHistoryService.java b/src/main/java/com/whyc/service/CKPowerDevAlarmHistoryService.java
index 92db4e6..1ddd173 100644
--- a/src/main/java/com/whyc/service/CKPowerDevAlarmHistoryService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevAlarmHistoryService.java
@@ -41,11 +41,14 @@
}
//鍘嗗彶澶撮儴缁熻
public Response getCountByLevel() throws InterruptedException {
- Map<Integer,Integer> countMap = new HashMap<>();
- countMap.put(0,0);
- countMap.put(1,0);
- countMap.put(2,0);
- countMap.put(3,0);
+ Map<String,Integer> countMap = new HashMap<>();
+ countMap.put("0",0);
+ countMap.put("1",0);
+ countMap.put("2",0);
+ countMap.put("3",0);
+ countMap.put("ac",0);
+ countMap.put("dc",0);
+ countMap.put("gc",0);
List<CKPowerDevAlarmHistory> allList=new ArrayList<>();
//鏌ヨ鎵�鏈夌殑鍘嗗彶鏃堕棿琛�
List<String> tableYearListInDB=subTablePageInfoService.getDevAlmHisList();
@@ -60,11 +63,25 @@
});
}
latch.await();
- countMap.put(0,allList.size());
+ countMap.put("0",allList.size());
Map<Integer, List<CKPowerDevAlarmHistory>> levelMap = allList.stream().collect(Collectors.groupingBy(CKPowerDevAlarmHistory::getAlmLevel));
Set<Integer> levelKeyMap = levelMap.keySet();
for (Integer level : levelKeyMap) {
- countMap.put(level,levelMap.get(level).size());
+ countMap.put(level.toString(),levelMap.get(level).size());
+ }
+ Map<Integer, List<CKPowerDevAlarmHistory>> typeMap = allList.stream().collect(Collectors.groupingBy(CKPowerDevAlarmHistory::getDevType));
+ Set<Integer> typeKeyMap = typeMap.keySet();
+ for (Integer type : typeKeyMap) {
+ if(type==1){
+ countMap.put("ac",levelMap.get(type).size());
+ }
+ if(type==2){
+ countMap.put("dc",levelMap.get(type).size());
+ }
+ if(type==3){
+ countMap.put("gc",levelMap.get(type).size());
+ }
+
}
return new Response().set(1,countMap);
}
--
Gitblit v1.9.1