From 694d691291f6ee89061fdbb9fd451ecb5519b69b Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 05 十二月 2022 15:35:26 +0800
Subject: [PATCH] 在线状态由map改成redis,定时保持emqx链接

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java
index 5104a94..6d23785 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java
@@ -18,6 +18,7 @@
 import com.sandu.ximon.admin.manager.iot.rrpc.topic.IBaseTopic;
 import com.sandu.ximon.admin.manager.iot.rrpc.topic.ICustomizeTopic;
 import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 
@@ -26,7 +27,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.sandu.ximon.admin.localMQTT.callback.StatusMqttCallBack.localMqttConnectStatusMap;
+import static com.sandu.ximon.admin.localMQTT.callback.StatusMqttCallBack.localMqttConnectStatus;
+
 
 /**
  * @author chenjiantian
@@ -195,11 +197,10 @@
             BatchGetDeviceStateResponse.DeviceStatus deviceStatus = new BatchGetDeviceStateResponse.DeviceStatus();
                     deviceStatus.setDeviceName(l);
 
-            if (localMqttConnectStatusMap.get(l)!=null &&
-                    localMqttConnectStatusMap.get(l)== 0){
-                deviceStatus.setStatus("OFFLINE");
-            }else {
+            if ("1".equals(RedisUtils.getBean().get(localMqttConnectStatus+l))){
                 deviceStatus.setStatus("ONLINE");
+            }else {
+                deviceStatus.setStatus("OFFLINE");
             }
             statusList.add(deviceStatus);
         });

--
Gitblit v1.9.3