From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 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 36fcf3a..29bdb90 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
@@ -22,14 +22,14 @@
// 蹇冭烦鍖呮暟鎹� 58
private HeartBeatDataPackage heartBeatDataPackage;
- private String originFrame;
-
@Override
public A5AtmosphereHeartbeatReportInnerFrame transformFrame(String hex) {
// 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
- 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)
@@ -131,11 +131,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);
@@ -205,7 +202,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;
//椋庡姏
@@ -223,8 +220,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":
@@ -286,18 +282,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