From f81b7065a40d1f9428d204b3bd6bcd126f306a19 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 10 八月 2022 17:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java
index 64ad2f8..5c4aa9a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java
@@ -27,10 +27,11 @@
@Override
public A5AtmosphereHeartbeatReportInnerFrame transformFrame(String hex) {
// 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
- //TODO
- if (StrUtil.isBlank(hex)) {
+ if (StrUtil.isBlank(hex) || hex.length() < 26 || hex.substring(18).length() % 8 != 0) {
+ System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
return null;
}
+
// MQTT閫氫俊鏂瑰紡(1)
setConnectType(hex.substring(0, 2));
// 鍔熻兘鐮�(1)
@@ -132,11 +133,8 @@
}
//璁惧鍨嬪彿
- Integer type = 0;
this.deviceType = hex.substring(0, 4);
- if (this.deviceType.equals(DeviceType.SENSOR_V1.getType())) {
- type = 1;
- }
+
//妯″潡棰勭儹鐘舵�佹爣蹇�
this.moduleWarmUpStatusFlag = hex.substring(4, 6);
@@ -206,7 +204,7 @@
}
} else if ("00".equals(sub.substring(4, 6))) {
//360搴︽椋庡悜浠�
- this.windDirection = parseVal(sub, 4, 8) * .1 + "鈩�";
+ this.windDirection = parseVal(sub, 4, 8) * .1 + "搴�";
}
break;
//椋庡姏
@@ -224,8 +222,7 @@
break;
//鍣煶
case "08":
-
- this.noise = parseVal(sub, 4, 8) * .1 + "dB";
+ this.noise = parseVal(sub, 4, 8).doubleValue() * .1 + "dB";
break;
//PM2.5
case "09":
@@ -287,18 +284,4 @@
}
}
- public enum DeviceType {
-
- SENSOR_V1("0101");
-
- private String type;
-
- DeviceType(String type) {
- this.type = type;
- }
-
- public String getType() {
- return type;
- }
- }
}
--
Gitblit v1.9.3