From 2e25dbb794bde83ebca485178b3447e8be0271e4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 21 十一月 2022 16:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java | 13 +++++++------
1 files changed, 7 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..5104a94 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;
@@ -68,7 +69,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 +88,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 +106,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);
}
@@ -195,10 +196,10 @@
deviceStatus.setDeviceName(l);
if (localMqttConnectStatusMap.get(l)!=null &&
- localMqttConnectStatusMap.get(l)== 1){
- deviceStatus.setStatus("ONLINE");
- }else {
+ localMqttConnectStatusMap.get(l)== 0){
deviceStatus.setStatus("OFFLINE");
+ }else {
+ deviceStatus.setStatus("ONLINE");
}
statusList.add(deviceStatus);
});
--
Gitblit v1.9.3