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/request/C3QrCodeReqInnerFrame.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/request/C3QrCodeReqInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3QrCodeReqInnerFrame.java
index f3a7e40..456a81e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3QrCodeReqInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3QrCodeReqInnerFrame.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.request;
+import cn.hutool.core.util.HexUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.IRequestInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.MQTTConnectTypeEnum;
@@ -14,13 +15,14 @@
private final String payload;
public C3QrCodeReqInnerFrame(String c3Mac, String qrCodeData) {
- payload = c3Mac + qrCodeData;
-
+ System.out.println("qrCodeData: " + qrCodeData);
+ String encodeHexStr = HexUtil.encodeHexStr(qrCodeData).toUpperCase();
+ payload = c3Mac + encodeHexStr;
}
@Override
public String getEncodeFrame() {
- String functionCode = C3ChargingEnum.QR_CODE_REQUEST.getCode();
+ String functionCode = C3ChargingEnum.QrCode.getCode();
//闀垮害鍙彉锛屼笉瀹氶暱
String payloadLength = SupplementUtils.suppleZero(Integer.toHexString((payload.length() / 2)).toUpperCase(), 4);
String frame = functionCode + payloadLength + payload;
--
Gitblit v1.9.3