From 982359342d0a4c868580c1e7db9784865941b5e1 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 15:06:49 +0800
Subject: [PATCH] 大气设备、数据（农耕）
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 4c11e0f..c746883 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
@@ -98,53 +98,53 @@
}
Integer type = 0;
this.deviceType = hex.substring(0, 4);
- if(this.deviceType.equals(DeviceType.SENSOR_V1.getType())) {
+ if (this.deviceType.equals(DeviceType.SENSOR_V1.getType())) {
type = 1;
}
this.moduleWarmUpStatusFlag = hex.substring(4, 6);
this.temperature = Double.parseDouble(
- parseVal(hex,6,8)
+ parseVal(hex, 6, 8)
+ "."
- + parseVal(hex,8,10)
+ + parseVal(hex, 8, 10)
);
this.humidity = Double.parseDouble(
- parseVal(hex,10,12)
+ parseVal(hex, 10, 12)
+ "."
- + parseVal(hex,12,14)
+ + parseVal(hex, 12, 14)
);
- this.windSpeed = parseVal(hex,14,18) * .1;
- this.windDirection = parseVal(hex,18,22) * .1;
- this.pressure = parseVal(hex,22,26);
- this.lightIntensity = parseVal(hex,26,32);
- this.noise = parseVal(hex,32, 36);
- this.pm25 = parseVal(hex,36, 40);
- this.pm10 = parseVal(hex,40,44);
- this.tsp = parseVal(hex,44,48);
+ this.windSpeed = parseVal(hex, 14, 18) * .1;
+ this.windDirection = parseVal(hex, 18, 22) * .1;
+ this.pressure = parseVal(hex, 22, 26);
+ this.lightIntensity = parseVal(hex, 26, 32);
+ this.noise = parseVal(hex, 32, 36);
+ this.pm25 = parseVal(hex, 36, 40);
+ this.pm10 = parseVal(hex, 40, 44);
+ this.tsp = parseVal(hex, 44, 48);
/**
* 浠ヤ笅鍖哄垎鐗堟湰
*/
- if(type.equals(1)) {
- this.ech2o = parseVal(hex,48, 52);
- this.tvoc = parseVal(hex,52, 56);
- this.co2 = parseVal(hex,56, 60);
+ if (type.equals(1)) {
+ this.ech2o = parseVal(hex, 48, 52);
+ this.tvoc = parseVal(hex, 52, 56);
+ this.co2 = parseVal(hex, 56, 60);
} else {
- this.so2 = parseVal(hex,48, 52);
- this.ech2o = parseVal(hex,48, 52);
- this.tvoc = parseVal(hex,52, 56);
- this.no2 = parseVal(hex,52, 56);
- this.co = parseVal(hex,56, 60);
- this.co2 = parseVal(hex,56, 60);
+ this.so2 = parseVal(hex, 48, 52);
+ this.ech2o = parseVal(hex, 48, 52);
+ this.tvoc = parseVal(hex, 52, 56);
+ this.no2 = parseVal(hex, 52, 56);
+ this.co = parseVal(hex, 56, 60);
+ this.co2 = parseVal(hex, 56, 60);
}
- this.o3 = parseVal(hex,60, 62);
- this.fluoride = parseVal(hex,62, 64);
+ this.o3 = parseVal(hex, 60, 62);
+ this.fluoride = parseVal(hex, 62, 64);
return this;
}
- private Integer parseVal (String frame, int start, int end) {
- return Integer.parseInt(frame.substring(start,end),16);
+ private Integer parseVal(String frame, int start, int end) {
+ return Integer.parseInt(frame.substring(start, end), 16);
}
}
--
Gitblit v1.9.3