From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java
index e077f5d..9dfc3bb 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java
@@ -19,8 +19,8 @@
Reboot("10"),
// 璁剧疆蹇冭烦鍖呴棿闅�
SettingHeartBeatTime("11"),
- //璁剧疆鍦板潃
- SettingAddress("12"),
+// //璁剧疆鍦板潃
+// SettingAddress("12"),
//浼犳劅鍣ㄥ姛鑳藉紑鍏�
SensorSwitch("13"),
//璁剧疆鏁版嵁淇鍊�-娓╁害
@@ -31,28 +31,38 @@
Setting_Data_Correction_windSpeed("16"),
//璁剧疆鏁版嵁淇鍊�-椋庡悜
Setting_Data_Correction_windDirection("17"),
+ //璁剧疆鏁版嵁淇鍊�-椋庡姏
+ Setting_Data_Correction_windPower("18"),
//璁剧疆鏁版嵁淇鍊�-姘斿帇
- Setting_Data_Correction_airPressure("18"),
+ Setting_Data_Correction_airPressure("19"),
//璁剧疆鏁版嵁淇鍊�-鍏夊己
- Setting_Data_Correction_lightIntensity("19"),
+ Setting_Data_Correction_lightIntensity("1A"),
//璁剧疆鏁版嵁淇鍊�-鍣煶
- Setting_Data_Correction_noise("1A"),
+ Setting_Data_Correction_noise("1B"),
//璁剧疆鏁版嵁淇鍊�-PM2.5
- Setting_Data_Correction_PM2_5("1B"),
+ Setting_Data_Correction_PM2_5("1C"),
//璁剧疆鏁版嵁淇鍊�-PM10
- Setting_Data_Correction_PM10("1C"),
+ Setting_Data_Correction_PM10("1D"),
+ //璁剧疆鏁版嵁淇鍊�-TSP
+ Setting_Data_Correction_tsp("1E"),
//璁剧疆鏁版嵁淇鍊�-闆ㄩ噺
- Setting_Data_Correction_rainfall("1D"),
+ Setting_Data_Correction_rain("1F"),
+ //璁剧疆鏁版嵁淇鍊�-鐢查啗
+ Setting_Data_Correction_ech2o("20"),
+ //璁剧疆鏁版嵁淇鍊�-TVOC
+ Setting_Data_Correction_tvoc("21"),
+ //璁剧疆鏁版嵁淇鍊�-eCO2
+ Setting_Data_Correction_eCO2("22"),
//璁剧疆鏁版嵁淇鍊�-SO2浜屾哀鍖栫～
- Setting_Data_Correction_SO2("1E"),
+ Setting_Data_Correction_SO2("23"),
//璁剧疆鏁版嵁淇鍊�-NO2浜屾哀鍖栨爱
- Setting_Data_Correction_NO2("1F"),
+ Setting_Data_Correction_NO2("24"),
//璁剧疆鏁版嵁淇鍊�-CO涓�姘у寲纰�
- Setting_Data_Correction_CO("20"),
+ Setting_Data_Correction_CO("25"),
//璁剧疆鏁版嵁淇鍊�-O3鑷哀
- Setting_Data_Correction_O3("21"),
+ Setting_Data_Correction_O3("26"),
//璁剧疆鏁版嵁淇鍊�-F姘熷寲鐗�
- Setting_Data_Correction_F("22"),
+ Setting_Data_Correction_F("27"),
// 澶ф皵璁惧蹇冭烦鍖呭瓨鍌�
@@ -76,14 +86,5 @@
AtmoFunctionCode(String code) {
this.code = code;
- }
-
- public static AtmoFunctionCode getByCode(String code) {
- for (AtmoFunctionCode atmoFunctionCode : values()) {
- if (atmoFunctionCode.getCode().equals(code)) {
- return atmoFunctionCode;
- }
- }
- return null;
}
}
--
Gitblit v1.9.3