From b9f73f7363bef95fc5ba445ee2fd749f3639443f Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:29 +0800
Subject: [PATCH] 新增本地MQTT模块，新增xm本地开发配置环境，启用了心跳包自动插入单灯设备，覆写了原rrpc方法，原阿里云自定义事件调用已注释掉
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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 6e93fc5..fa06c8b 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
@@ -6,6 +6,7 @@
import com.aliyuncs.exceptions.ClientException;
import com.aliyuncs.iot.model.v20180120.*;
import com.sandu.common.execption.BusinessException;
+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;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
@@ -17,6 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import java.util.Base64;
import java.util.List;
import java.util.Map;
@@ -65,33 +67,37 @@
@Override
public CommonFrame sendRRPC(String deviceName, IRequestFrame iRequestFrame) {
- InvokeParam param = new InvokeParam();
- param.setOperate("1001");
- param.setFrame(iRequestFrame.getEncodeFrame());
- InvokeThingServiceResponse.Data data = invokeThing(deviceName, param, false);
- if (data == null) {
- return null;
- }
- String result = data.getResult();
- result = result.replace("\\", "");
- Map map = JSON.parseObject(result, Map.class);
- result = (String) map.get("msg");
+// InvokeParam param = new InvokeParam();
+// param.setOperate("1001");
+// param.setFrame(iRequestFrame.getEncodeFrame());
+// InvokeThingServiceResponse.Data data = invokeThing(deviceName, param, false);
+// if (data == null) {
+// return null;
+// }
+// String result = data.getResult();
+// result = result.replace("\\", "");
+// Map map = JSON.parseObject(result, Map.class);
+// result = (String) map.get("msg");
+ String frame = FrameUtils.transformMessageToFrame(iRequestFrame.getEncodeFrame()).toString();
+ String result = MqttClientUtil.sendMqttMsg(deviceName,frame);
return FrameUtils.transformMessageToFrame(result);
}
@Override
public CommonFrame sendRRPC(String deviceName, IRequestFrame iRequestFrame, boolean resendFlag) {
- InvokeParam param = new InvokeParam();
- param.setOperate("1001");
- param.setFrame(iRequestFrame.getEncodeFrame());
- InvokeThingServiceResponse.Data data = invokeThing(deviceName, param, true);
- if (data == null) {
- return null;
- }
- String result = data.getResult();
- result = result.replace("\\", "");
- Map map = JSON.parseObject(result, Map.class);
- result = (String) map.get("msg");
+// InvokeParam param = new InvokeParam();
+// param.setOperate("1001");
+// param.setFrame(iRequestFrame.getEncodeFrame());
+// InvokeThingServiceResponse.Data data = invokeThing(deviceName, param, true);
+// if (data == null) {
+// return null;
+// }
+// String result = data.getResult();
+// result = result.replace("\\", "");
+// Map map = JSON.parseObject(result, Map.class);
+// result = (String) map.get("msg");
+ String frame = FrameUtils.transformMessageToFrame(iRequestFrame.getEncodeFrame()).toString();
+ String result = MqttClientUtil.sendMqttMsg(deviceName,frame);
return FrameUtils.transformMessageToFrame(result);
}
--
Gitblit v1.9.3