From 08429736fe89c3c3a988d794f7cb6c0170d18afa Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期三, 19 十月 2022 16:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java
index d5b4ff8..75b2988 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java
@@ -5,6 +5,7 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;
import lombok.Data;
import lombok.ToString;
@@ -26,6 +27,10 @@
private String IntervalTime;
//鏌ヨ鐢靛帇/鐢垫祦甯告暟
private String constant;
+ //鏌ヨ鍦板潃(鏆傛椂涓嶇敤鍒帮級
+ private String address;
+ //鏁呴殰鐮�
+ private String faultCode;
@Override
public A5C3QueryReportInnerFrame transformFrame(String hex) {
@@ -83,6 +88,26 @@
}
setConstant("鐢靛帇甯告暟锛�" + parseVal(hex, 0, 2) + " ;鐢垫祦甯告暟锛�" + parseVal(hex, 2, 4));
}
+
+ /**
+ * 鏌ヨ鍦板潃(鏆傛椂涓嶇敤鍒帮級
+ */
+ if (functionCode.equals(C3ChargingEnum.QueryAddress.getCode())) {
+ if (hex.length() != 4) {
+ throw new BusinessException("鏁版嵁閿欒锛岃閲嶆柊璇锋眰锛�");
+ }
+ setAddress(SupplementUtils.suppleZero(hex, 8));
+ }
+
+ /**
+ * 鏌ヨ鍦板潃(鏆傛椂涓嶇敤鍒帮級
+ */
+ if (functionCode.equals(C3ChargingEnum.QueryFaultCode.getCode())) {
+ if (hex.length() != 4) {
+ throw new BusinessException("鏁版嵁閿欒锛岃閲嶆柊璇锋眰锛�");
+ }
+ setFaultCode(hex);
+ }
}
private Integer parseVal(String frame, int start, int end) {
--
Gitblit v1.9.3