From e6ca7ead72de88017eb786fbfc5d8450b8164878 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 26 九月 2022 18:28:54 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 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 738a15d..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"),
 
 
     //  澶ф皵璁惧蹇冭烦鍖呭瓨鍌�

--
Gitblit v1.9.3