From b531004a3cbd33d7bb9f5b7dce06ddd4f5e7ec9a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 18 十一月 2022 11:57:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index 6d90489..0de67ea 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -60,6 +60,8 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
+import static com.sandu.ximon.admin.localMQTT.callback.StatusMqttCallBack.localMqttConnectStatusMap;
+
/**
* 鐏潌鐩稿叧
*
@@ -1050,7 +1052,7 @@
* @return 璁惧鐘舵�佸垪琛�
*/
public List<DeviceStatus> listStatusByDeviceCode(ArrayList<String> deviceCodeList) {
- // 鏈�澶у彧鑳芥煡50涓�
+// 鏈�澶у彧鑳芥煡50涓�
List<List<String>> split = CollectionUtil.split(deviceCodeList, 50);
List<DeviceStatus> statusList = new ArrayList<>();
for (List<String> list : split) {
@@ -1064,6 +1066,21 @@
}
}
}
+// List<DeviceStatus> statusList = new ArrayList<>();
+//
+// deviceCodeList.forEach(l -> {
+// DeviceStatus deviceStatus = new DeviceStatus();
+// deviceStatus.setDeviceCode(l);
+//
+// if (localMqttConnectStatusMap.get(l)!=null &&
+// localMqttConnectStatusMap.get(l)== 1){
+// deviceStatus.setStatus(1);
+// }else {
+// deviceStatus.setStatus(0);
+// }
+// statusList.add(deviceStatus);
+// });
+
return statusList;
}
@@ -1419,4 +1436,4 @@
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3