From 0d8647997e6df77db83fa3a422d67f3ed1212fcc Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 06 九月 2024 11:19:44 +0800
Subject: [PATCH] 首页统计staticSocket

---
 src/main/java/com/whyc/service/DevInfService.java |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/whyc/service/DevInfService.java b/src/main/java/com/whyc/service/DevInfService.java
index 30254db..ab94ddc 100644
--- a/src/main/java/com/whyc/service/DevInfService.java
+++ b/src/main/java/com/whyc/service/DevInfService.java
@@ -196,25 +196,37 @@
         staticTypeMap.put(1,0);
         staticTypeMap.put(2,0);
 
-        Map<Integer,Integer> staticStateMap=new HashMap<>();
-        staticStateMap.put(0,0);
-        staticStateMap.put(1,0);
-
+        Map<Integer,Integer> a200staticStateMap=new HashMap<>();
+        a200staticStateMap.put(0,0);
+        a200staticStateMap.put(1,0);
+        Map<Integer,Integer> actmstaticStateMap=new HashMap<>();
+        actmstaticStateMap.put(0,0);
+        actmstaticStateMap.put(1,0);
+        Map<String,Object> typestateMap=new HashMap<>();
+        typestateMap.put("a200",a200staticStateMap);
+        typestateMap.put("actm",actmstaticStateMap);
         List<DevInf> list=mapper.getDevStaticByType(userId);
-
-
         Map<Integer, List<DevInf>> typeMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevType));
         for (Integer type : typeMap.keySet()) {
             staticTypeMap.put(type, typeMap.get(type).size());
-        }
-
-        Map<Integer, List<DevInf>> stateMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevOnline));
-        for (Integer state : stateMap.keySet()) {
-            staticStateMap.put(state, stateMap.get(state).size());
+            List<DevInf> typeList= typeMap.get(type);
+            Map<Integer, List<DevInf>> stateMap = typeList.stream().collect(Collectors.groupingBy(DevInf::getDevOnline));
+            if(type==1){
+                for (Integer state : stateMap.keySet()) {
+                    a200staticStateMap.put(state, stateMap.get(state).size());
+                }
+                typestateMap.put("a200", a200staticStateMap);
+            }
+            if(type==2){
+                for (Integer state : stateMap.keySet()) {
+                    actmstaticStateMap.put(state, stateMap.get(state).size());
+                }
+                typestateMap.put("actm", actmstaticStateMap);
+            }
         }
         map.put("dinf",list!=null?list:null);
         map.put("type",staticTypeMap);
-        map.put("state",staticStateMap);
+        map.put("state",typestateMap);
         return map;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1