From 8dcbf0608171abce431df0356f11efbbc6c2de40 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 27 七月 2022 15:45:52 +0800
Subject: [PATCH] 充电桩故障存储
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java
index 7b4e534..0ed6a5d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
@@ -7,10 +8,7 @@
import lombok.ToString;
/**
- * @author chenjiantian
- * @date 2021/12/6 14:46
- * A5-81-42
- * 鍗曠伅涓婃姤ampq 鏁呴殰鐮�
+ * C3鍏呯數妗╂晠闅滀笂鎶ュ抚
*/
@Data
@ToString(callSuper = true)
@@ -23,7 +21,7 @@
/**
* 鏁呴殰鐮�
*/
- private String errorCode;
+ private int errorCode;
@Override
public A5C3ErrorCodeReportInnerFrame transformFrame(String hex) {
@@ -39,10 +37,13 @@
setDestinationAddress(hex.substring(8, 16));
- setErrorCode(hex.substring(16, hex.length() - 8));
+ //鏁呴殰鐮�
+ String errorCodeHex = hex.substring(16, hex.length() - 8);
+ errorCode = HexUtil.hexToInt(errorCodeHex);
+
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