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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 c78d4a0..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
@@ -7,6 +7,7 @@
import com.aliyuncs.iot.model.v20180120.*;
import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.dto.DeviceStatus;
+import com.sandu.ximon.admin.localMQTT.util.HexFrameUtils;
import com.sandu.ximon.admin.localMQTT.util.MqttClientUtil;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
@@ -17,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;
@@ -25,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
@@ -68,7 +71,7 @@
// Map map = JSON.parseObject(result, Map.class);
// result = (String) map.get("msg");
String result = MqttClientUtil.sendMqttMsg(deviceName,invokeParam.getFrame());
- return FrameUtils.transformMessageToFrame(result);
+ return HexFrameUtils.transformMessageToFrame(result);
}
@Override
@@ -87,7 +90,7 @@
String frame = FrameUtils.transformMessageToFrame(iRequestFrame.getEncodeFrame()).toString();
String result = MqttClientUtil.sendMqttMsg(deviceName,frame);
log.info("鑷畾涔塻endRRPC:璇锋眰甯э細{},\n,鍝嶅簲甯�:{}",iRequestFrame.toString(),result);
- return FrameUtils.transformMessageToFrame(result);
+ return HexFrameUtils.transformMessageToFrame(result);
}
@Override
@@ -105,7 +108,7 @@
// result = (String) map.get("msg");
String frame = FrameUtils.transformMessageToFrame(iRequestFrame.getEncodeFrame()).toString();
String result = MqttClientUtil.sendMqttMsg(deviceName,frame);
- return FrameUtils.transformMessageToFrame(result);
+ return HexFrameUtils.transformMessageToFrame(result);
}
@@ -194,8 +197,7 @@
BatchGetDeviceStateResponse.DeviceStatus deviceStatus = new BatchGetDeviceStateResponse.DeviceStatus();
deviceStatus.setDeviceName(l);
- if (localMqttConnectStatusMap.get(l)!=null &&
- localMqttConnectStatusMap.get(l)== 1){
+ if ("1".equals(RedisUtils.getBean().get(localMqttConnectStatus+l))){
deviceStatus.setStatus("ONLINE");
}else {
deviceStatus.setStatus("OFFLINE");
--
Gitblit v1.9.3