From 798400ebc4769a6afec56ebbf8198e87e6c1a683 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 18:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3ErrorEnum.java |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3ErrorEnum.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3ErrorEnum.java
index 5b5f95b..33b7755 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3ErrorEnum.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3ErrorEnum.java
@@ -13,87 +13,87 @@
     /**
      * 閫氫俊娴佺▼瓒呮椂
      */
-    IO_OVER_TIME(1, "閫氫俊娴佺▼瓒呮椂"),
+    IO_OVER_TIME(31, "閫氫俊娴佺▼瓒呮椂"),
     /**
      * 鏃犵數鍘�
      */
-    NO_VOL(2, "鏃犵數鍘�"),
+    NO_VOL(30, "鏃犵數鍘�"),
     /**
      * 鏃犵數娴�
      */
-    NO_CUR(4, "鏃犵數娴�"),
+    NO_CUR(29, "鏃犵數娴�"),
     /**
      * 鏃犲姛鐜�
      */
-    NO_POWER(8, "鏃犲姛鐜�"),
+    NO_POWER(28, "鏃犲姛鐜�"),
     /**
      * 鍏呯數鍔熺巼杩囧皬
      */
-    LOWER_POWER(16, "鍏呯數鍔熺巼杩囧皬"),
+    LOWER_POWER(27, "鍏呯數鍔熺巼杩囧皬"),
     /**
      * 婕忕數
      */
-    OUTPUT_ELE_LEAKAGE(32, "婕忕數"),
+    OUTPUT_ELE_LEAKAGE(26, "婕忕數"),
     /**
      * 璁惧娓╁害杩囬珮
      */
-    DEVICE_TEMPERATURE_HIGHER(64, "璁惧娓╁害杩囬珮"),
+    DEVICE_TEMPERATURE_HIGHER(25, "璁惧娓╁害杩囬珮"),
     /**
      * 璁惧娓╁害杩囦綆
      */
-    DEVICE_TEMPERATURE_LOW(128, "璁惧娓╁害杩囦綆"),
+    DEVICE_TEMPERATURE_LOW(24, "璁惧娓╁害杩囦綆"),
     /**
      * 鍏呯數瓒呮椂
      */
-    CHARING_OVER_TIME(256, "鍏呯數瓒呮椂"),
+    CHARING_OVER_TIME(23, "鍏呯數瓒呮椂"),
     /**
      * 鏃犵綉缁�
      */
-    NO_NETWORK(512, "鏃犵綉缁�"),
+    NO_NETWORK(22, "鏃犵綉缁�"),
     /**
      * 杩炴帴涓绘満瓒呮椂
      */
-    CONNECT_HOST_OVER_TIMED(1024, "杩炴帴涓绘満瓒呮椂"),
+    CONNECT_HOST_OVER_TIMED(21, "杩炴帴涓绘満瓒呮椂"),
     /**
      * 杩炴帴鏈嶅姟鍣ㄨ秴鏃�
      */
-    CONNECT_SERVICE_OVER_TIMED(2048, "杩炴帴鏈嶅姟鍣ㄨ秴鏃�"),
+    CONNECT_SERVICE_OVER_TIMED(20, "杩炴帴鏈嶅姟鍣ㄨ秴鏃�"),
     /**
      * 瑙︽懜灞忔棤鍝嶅簲
      */
-    LED_ERROR(4096, "瑙︽懜灞忔棤鍝嶅簲"),
+    LED_ERROR(19, "瑙︽懜灞忔棤鍝嶅簲"),
     /**
      * 鍐欏叆Flash澶辫触
      */
-    INPUT_FLASH_ERROR(8192, "鍐欏叆Flash澶辫触"),
+    INPUT_FLASH_ERROR(18, "鍐欏叆Flash澶辫触"),
     /**
      * 鍐欏叆EEProm澶辫触
      */
-    INPUT_EEPROM_ERROR(16384, "鍐欏叆EEProm澶辫触"),
+    INPUT_EEPROM_ERROR(17, "鍐欏叆EEProm澶辫触"),
     /**
      * 鐢靛帇杩囦綆
      */
-    LOWER_VOL(32768, "鐢靛帇杩囦綆"),
+    LOWER_VOL(16, "鐢靛帇杩囦綆"),
     /**
      * 鐢靛帇杩囬珮
      */
-    OVER_VOL(65536, "鐢靛帇杩囬珮"),
+    OVER_VOL(15, "鐢靛帇杩囬珮"),
     /**
      * 鍦伴攣鏁呴殰锛堜笉鑳介攣涓婏級
      */
-    LOCK_ERROR(131072, "鍦伴攣鏁呴殰锛堜笉鑳介攣涓婏級"),
+    LOCK_ERROR(14, "鍦伴攣鏁呴殰锛堜笉鑳介攣涓婏級"),
     /**
      * 鍦伴攣鏁呴殰锛堜笉鑳借В閿侊級
      */
-    UNLOCK_ERROR(262144, "鍦伴攣鏁呴殰锛堜笉鑳借В閿侊級"),
+    UNLOCK_ERROR(13, "鍦伴攣鏁呴殰锛堜笉鑳借В閿侊級"),
     /**
      * 鍏呯數鍙�1鏁呴殰
      */
-    Charging_port_error(524288, "鍏呯數鍙�1鏁呴殰"),
+    Charging_port_error(12, "鍏呯數鍙�1鏁呴殰"),
     /**
      * 鍏呯數鍙�1涓嶈兘杩炴帴杞︽満
      */
-    CONNECT_DEVICE_ERROR(2097152, "鍏呯數鍙�1涓嶈兘杩炴帴杞︽満"),
+    CONNECT_DEVICE_ERROR(10, "鍏呯數鍙�1涓嶈兘杩炴帴杞︽満"),
 
     ;
 

--
Gitblit v1.9.3