From 47af8735b1172b501919474acea1f0a6f2dae828 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 29 八月 2024 11:45:50 +0800
Subject: [PATCH] 设备信息实时推送
---
src/main/java/com/whyc/service/DevInfService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/DevInfService.java b/src/main/java/com/whyc/service/DevInfService.java
index 1c83e84..e1a14c0 100644
--- a/src/main/java/com/whyc/service/DevInfService.java
+++ b/src/main/java/com/whyc/service/DevInfService.java
@@ -57,7 +57,9 @@
public Response getAllInf(Integer uid, DevInfDto devInfDto) {
Map<String, Object> allMap = new HashMap<>();
PageHelper.startPage(devInfDto.getPageNum(), devInfDto.getPageSize());
- List<DevInf> list=mapper.getAllInf(uid,devInfDto.getDevType());
+ List<DevInf> listype=mapper.getAllInf(uid,devInfDto.getDevType());
+
+ List<DevInf> list=mapper.getLine(uid);
Map<Integer, List<DevInf>> typeDevMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevType));
Map<Integer, List<DevInf>> onlineDevMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevOnline));
@@ -74,13 +76,13 @@
for (Integer online : onlineDevMap.keySet()) {
onlineMap.put(online, onlineDevMap.get(online).size());
}
- PageInfo pageInfo=new PageInfo(list);
+ PageInfo pageInfo=new PageInfo(listype);
allMap.put("type",typeMap);
allMap.put("onlineMap",onlineMap);
allMap.put("devSum",devSum);
allMap.put("pageInfo",pageInfo);
- return new Response().setII(1,list!=null,allMap,"鑾峰彇鎵�鏈夌殑璁惧淇℃伅");
+ return new Response().setII(1,listype!=null,allMap,"鑾峰彇鎵�鏈夌殑璁惧淇℃伅");
}
//鑾峰彇宸︿晶鍒楄〃
--
Gitblit v1.9.1