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/frame/inner/report/A5LightErrorCodeReportInnerFrame.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java
index c48128f..527dcc1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java
@@ -28,8 +28,10 @@
@Override
public A5LightErrorCodeReportInnerFrame transformFrame(String hex) {
- if (StrUtil.isBlank(hex)) {
+ if (StrUtil.isBlank(hex) || hex.length() != 24) {
+ System.out.println("hex is blank or length is not 24");
return null;
+
}
// MQTT閫氫俊鏂瑰紡(1)
setConnectType(hex.substring(0, 2));
@@ -42,11 +44,11 @@
String errorCodeHex = hex.substring(12, 16);
errorCode = HexUtil.hexToInt(errorCodeHex);
- System.out.println("鏁呴殰鐮侊細"+ errorCodeHex +" - " + errorCode);
+ System.out.println("鏁呴殰鐮侊細" + errorCodeHex + " - " + errorCode);
setCrc32(hex.substring(hex.length() - 8));
// 鏍￠獙CRC32
- String frame = getFunctionCode() + getPayloadLength() + getDestinationAddress() + getErrorCode();
+ String frame = getFunctionCode() + getPayloadLength() + getDestinationAddress() + errorCodeHex;
this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
return this;
}
--
Gitblit v1.9.3