From 74a6454275dc8539b0369b67e7914633d47a9253 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 02 八月 2022 09:32:26 +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 | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 c746883..83c66e0 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
@@ -70,21 +70,24 @@
// 鍏夊己
private Integer lightIntensity;
// 鍣煶
- private Integer noise;
+ private Double noise;
// PM2.5
private Integer pm25;
// PM10
private Integer pm10;
- // 鎬绘偓娴绮掔墿锛圱SP锛�
- private Integer tsp;
- // SO2浜屾哀鍖栫～/鐢查啗鐩稿鍊�
+ // 闆ㄩ噺
+ private Double rainfall;
+ // SO2浜屾哀鍖栫～鐩稿鍊�
private Integer so2;
+ // 鐢查啗鐩稿鍊�
private Integer ech2o;
- // NO2浜屾哀鍖栨爱/TVOC
+ // NO2浜屾哀鍖栨爱
private Integer no2;
+ // TVOC
private Integer tvoc;
- // CO涓�姘у寲纰� /浜屾哀鍖栫⒊
+ // CO涓�姘у寲纰�
private Integer co;
+ // 浜屾哀鍖栫⒊
private Integer co2;
// O3鑷哀
private Integer o3;
@@ -116,10 +119,10 @@
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.noise = parseVal(hex, 32, 36) * .1;
this.pm25 = parseVal(hex, 36, 40);
this.pm10 = parseVal(hex, 40, 44);
- this.tsp = parseVal(hex, 44, 48);
+ this.rainfall = parseVal(hex, 44, 48) * .1;
/**
* 浠ヤ笅鍖哄垎鐗堟湰
--
Gitblit v1.9.3