From 5d6834337b696e4eb3b6acfee992c45fd416dccf Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 15 三月 2023 15:24:41 +0800
Subject: [PATCH] 测试

---
 src/main/java/com/whyc/service/DevalarmDataService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/service/DevalarmDataService.java b/src/main/java/com/whyc/service/DevalarmDataService.java
index 40fdf5d..c22a2c1 100644
--- a/src/main/java/com/whyc/service/DevalarmDataService.java
+++ b/src/main/java/com/whyc/service/DevalarmDataService.java
@@ -126,16 +126,22 @@
             Map<String, Object> map = new HashMap<>();
             int dtatolNum = 0;
             Map<String, Integer> dAlmClearMap = new HashMap<>();
+            dAlmClearMap.put("clear0", 0);
+            dAlmClearMap.put("clear1", 1);
             List<DevalarmData> dAlmList = mapper.getDalmToday(userId);
             Map<Integer, List<DevalarmData>> dclearedMap = dAlmList.stream().collect(Collectors.groupingBy(DevalarmData::getAlmClearedType));
             for (Integer cleared : dclearedMap.keySet()) {
-                dAlmClearMap.put(String.valueOf(cleared), dclearedMap.get(cleared).size());
+                dAlmClearMap.put("clear" + String.valueOf(cleared), dclearedMap.get(cleared).size());
                 dtatolNum += dclearedMap.get(cleared).size();
             }
             Map<String, Integer> dAlmLevelMap = new HashMap<>();
+            dAlmLevelMap.put("level1", 0);
+            dAlmLevelMap.put("level2", 0);
+            dAlmLevelMap.put("level3", 0);
+            dAlmLevelMap.put("level4", 0);
             Map<Integer, List<DevalarmData>> dlevelMap = dAlmList.stream().collect(Collectors.groupingBy(DevalarmData::getAlmLevel));
             for (Integer level : dlevelMap.keySet()) {
-                dAlmLevelMap.put(String.valueOf(level), dlevelMap.get(level).size());
+                dAlmLevelMap.put("level" + String.valueOf(level), dlevelMap.get(level).size());
                 dtatolNum += dlevelMap.get(level).size();
             }
             map.put("dAlmClearMap", dAlmClearMap);

--
Gitblit v1.9.1