From 3cdb1ada032fb650c37d8e9240979b4daedf1b08 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 21 三月 2022 16:49:12 +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 | 12 ++++++++++++
1 files changed, 12 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 6ff4260..84b75c3 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
@@ -28,6 +28,8 @@
private String constant;
//鏌ヨ鍦板潃(鏆傛椂涓嶇敤鍒帮級
private String address;
+ //鏁呴殰鐮�
+ private String faultCode;
@Override
public A5C3QueryReportInnerFrame transformFrame(String hex) {
@@ -95,6 +97,16 @@
}
setAddress(hex);
}
+
+ /**
+ * 鏌ヨ鍦板潃(鏆傛椂涓嶇敤鍒帮級
+ */
+ 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