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 | 143 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 116 insertions(+), 27 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 dcdb366..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;
@@ -14,8 +15,10 @@
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import java.util.Base64;
import java.util.List;
import java.util.Map;
@@ -23,6 +26,7 @@
* @author chenjiantian
* @date 2021/12/2 18:21
*/
+@Slf4j
public abstract class BaseInvokeSyncService implements IInvoke, IBaseTopic, ICustomizeTopic {
/**
@@ -33,10 +37,10 @@
* @param clz 鍐呴儴甯у搷搴斿疄浣撶被 濡傛灉涓嶆兂鑷繁瑙ｆ瀽 鍙甫涓�
* @return 杩斿洖鐨勮В鐮佸抚瀹炰綋绫� 鍚屾椂鎶婂唴閮ㄥ抚瑙ｇ爜涔嬪悗涔熸惡甯︿笂
*/
- public <T extends BaseResponseInnerFrame<T>> WrapResponseCommonFrame<T> sendRRPC(String deviceName, IRequestFrame iRequestFrame, Class<T> clz){
+ public <T extends BaseResponseInnerFrame<T>> WrapResponseCommonFrame<T> sendRRPC(String deviceName, IRequestFrame iRequestFrame, Class<T> clz) {
CommonFrame commonFrame = sendRRPC(deviceName, iRequestFrame);
if (commonFrame == null) {
- throw new BusinessException("rrpc璇锋眰澶辫触");
+ return null;
}
WrapResponseCommonFrame<T> responseCommonFrame = new WrapResponseCommonFrame<>();
BeanUtils.copyProperties(commonFrame, responseCommonFrame);
@@ -49,11 +53,8 @@
}
@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);
+ public CommonFrame sendRRPC(String deviceName, InvokeParam invokeParam) {
+ InvokeThingServiceResponse.Data data = invokeThing(deviceName, invokeParam, false);
if (data == null) {
return null;
}
@@ -61,9 +62,48 @@
result = result.replace("\\", "");
Map map = JSON.parseObject(result, Map.class);
result = (String) map.get("msg");
- CommonFrame connectFrame = FrameUtils.transformMessageToFrame(result);
- return connectFrame;
+ return FrameUtils.transformMessageToFrame(result);
}
+
+ @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");
+ 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");
+ String frame = FrameUtils.transformMessageToFrame(iRequestFrame.getEncodeFrame()).toString();
+ String result = MqttClientUtil.sendMqttMsg(deviceName,frame);
+ return FrameUtils.transformMessageToFrame(result);
+ }
+
+
+
+
/**
* 鍩虹閫氫俊鍚屾璋冪敤
@@ -151,7 +191,7 @@
return null;
}
- /**
+ /**
* 璋冪敤鑷畾涔塼opic
* https://help.aliyun.com/document_detail/69584.htm?spm=a2c4g.11186623.0.0.25b33982bSQSom#reference-snk-mrz-wdb
*
@@ -159,35 +199,84 @@
* @param param 鍙傛暟
* @return 璁惧杩斿洖鐨勭粨鏋�
*/
- protected InvokeThingServiceResponse.Data invokeThing(String deviceName, InvokeParam param) {
+ protected InvokeThingServiceResponse.Data invokeThing(String deviceName, InvokeParam param, boolean resendFlag) {
// 濉厖鏈嶅姟璋冪敤鐨勫弬鏁�
InvokeThingServiceRequest request = new InvokeThingServiceRequest();
// 璁惧璇佷功涔媝roductKey
request.setProductKey(getProductKey());
// 璁惧璇佷功涔媎eviceName
request.setDeviceName(deviceName);
+ request.setSysReadTimeout(5000);
// 瑕佽皟鐢ㄧ殑鏈嶅姟鏍囪瘑绗︼紝鍙栧喅浜庢湇鍔＄瀹氫箟 鐩墠rrpc鏍囪瘑浠ｈ〃鍚屾璋冪敤
request.setIdentifier("rrpc");
request.setArgs(JSON.toJSONString(param));
// 鑾峰緱鏈嶅姟璋冪敤鍝嶅簲
- InvokeThingServiceResponse response = null;
- try {
- response = getClient().getAcsResponse(request);
- } catch (ClientException e) {
- e.printStackTrace();
+ if (resendFlag) {
+ return getAcsResponse(request, true, 1);
+
+ } else {
+ return getAcsResponse(request, false, null);
+
}
- if (response == null) {
- throw new BusinessException("璋冪敤rrpc澶辫触");
+ }
+
+ /**
+ * 鑾峰緱鏈嶅姟璋冪敤鍝嶅簲
+ *
+ * @param request
+ * @return
+ */
+ private InvokeThingServiceResponse.Data getAcsResponse(InvokeThingServiceRequest request, boolean resendFlag, Integer time) {
+
+ if (resendFlag) {
+ //闇�瑕侀噸鍙�
+ if (time <= 2) {
+ InvokeThingServiceResponse response = null;
+ try {
+ response = getClient().getAcsResponse(request);
+ if (response == null) {
+ log.error("璋冪敤rrpc澶辫触锛屽搷搴斾负绌猴紒");
+ return getAcsResponse(request, true, time + 1);
+ }
+ if (!response.getSuccess()) {
+ log.error("璋冪敤rrpc澶辫触锛�" + response.getErrorMessage());
+ return getAcsResponse(request, true, time + 1);
+ } else {
+ // 鏈嶅姟璋冪敤鎴愬姛锛屼粎浠ｈ〃鍙戦�佹湇鍔℃寚浠ょ殑鎴愬姛锛屼笉浠ｈ〃鎵ц鏈嶅姟鏈韩鏄惁鎴愬姛
+ return response.getData();
+ }
+ } catch (Exception e) {
+ return getAcsResponse(request, true, time + 1);
+// throw new BusinessException("閿欒淇℃伅锛�" + e.getMessage());
+ }
+ } else {
+ throw new BusinessException("纭欢璇锋眰澶辫触锛岃妫�鏌ョ‖浠惰澶囷紒");
+ }
+
+ } else {
+ //涓嶉渶瑕侀噸鍙�
+ InvokeThingServiceResponse response = null;
+ try {
+ response = getClient().getAcsResponse(request);
+ } catch (ClientException e) {
+ e.printStackTrace();
+ throw new BusinessException("纭欢璇锋眰澶辫触锛岃妫�鏌ョ‖浠惰澶囷紒");
+ }
+ if (response == null) {
+ throw new BusinessException("璋冪敤rrpc澶辫触锛屽搷搴斾负绌猴紒");
+ }
+ if (!response.getSuccess()) {
+ throw new BusinessException("璋冪敤rrpc澶辫触锛�" + response.getErrorMessage());
+ }
+ // 鏈嶅姟璋冪敤鎴愬姛锛屼粎浠ｈ〃鍙戦�佹湇鍔℃寚浠ょ殑鎴愬姛锛屼笉浠ｈ〃鎵ц鏈嶅姟鏈韩鏄惁鎴愬姛
+ if (response.getSuccess()) {
+ // 浠呭悓姝ユ湇鍔℃湁result
+ return response.getData();
+ }
+ return null;
}
- if (!response.getSuccess()) {
- throw new BusinessException("璋冪敤rrpc澶辫触锛�" + response.getErrorMessage());
- }
- // 鏈嶅姟璋冪敤鎴愬姛锛屼粎浠ｈ〃鍙戦�佹湇鍔℃寚浠ょ殑鎴愬姛锛屼笉浠ｈ〃鎵ц鏈嶅姟鏈韩鏄惁鎴愬姛
- if (response.getSuccess()) {
- // 浠呭悓姝ユ湇鍔℃湁result
- return response.getData();
- }
- return null;
+
+
}
}
--
Gitblit v1.9.3