From 83be53d31f313a341238fc9422cc0e42bd3c12cc Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 17:21:19 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 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 bc28769..770f415 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
@@ -339,6 +339,8 @@
List<Pole> online = new ArrayList<>();//鍦ㄧ嚎
List<Pole> offline = new ArrayList<>();//绂荤嚎
list.forEach(onLinePole -> {
+ System.out.println("online---------------------------------------------------" + ("ONLINE").equals(onLinePole.getOnLineState()));
+ System.out.println("online---------------------------------------------------" + (onLinePole.getOnLineState()));
if (("ONLINE").equals(onLinePole.getOnLineState())) {
online.add(onLinePole);
} else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
@@ -438,29 +440,20 @@
MacCodes.add(post.getDeviceCode());
}
}
+//
+ List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
+ if (deviceStatuses != null) {
+ for (Pole post : list) {
+ for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
- List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses=null;
+ if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
+ post.setOnLineState(deviceStatus.getStatus());
- //鎷嗗垎list
- List<List<String>> split = CollectionUtil.split(MacCodes, 50);
-
- for (List<String> splist : split) {
- deviceStatuses=MainBoardInvokeSyncService.getInstance().batchGetDeviceState(splist);
- if (deviceStatuses != null) {
- for (Pole post : list) {
- for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
-
- if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
- post.setOnLineState(deviceStatus.getStatus());
- }
}
-
}
+
}
}
-
-// List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
-
return list;
}
--
Gitblit v1.9.3