From ea8e8e7dd5f10cff4054f5fde8fd3961aaac1834 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 14 十月 2022 16:55:30 +0800
Subject: [PATCH] 大气设备农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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..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;
@@ -28,6 +29,8 @@
private String constant;
//鏌ヨ鍦板潃(鏆傛椂涓嶇敤鍒帮級
private String address;
+ //鏁呴殰鐮�
+ private String faultCode;
@Override
public A5C3QueryReportInnerFrame transformFrame(String hex) {
@@ -93,7 +96,17 @@
if (hex.length() != 4) {
throw new BusinessException("鏁版嵁閿欒锛岃閲嶆柊璇锋眰锛�");
}
- setAddress(hex);
+ setAddress(SupplementUtils.suppleZero(hex, 8));
+ }
+
+ /**
+ * 鏌ヨ鍦板潃(鏆傛椂涓嶇敤鍒帮級
+ */
+ if (functionCode.equals(C3ChargingEnum.QueryFaultCode.getCode())) {
+ if (hex.length() != 4) {
+ throw new BusinessException("鏁版嵁閿欒锛岃閲嶆柊璇锋眰锛�");
+ }
+ setFaultCode(hex);
}
}
--
Gitblit v1.9.3