From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
index 42674f1..7c70fd2 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
@@ -26,16 +26,17 @@
GROUP_LIST("鍒嗙粍鍒楄〃"),
LIGHT_TASK_LIST("璺伅浠诲姟鍒楄〃"),
LIGHT_DATA("鍗曠伅鐩戞帶鏁版嵁"),
+ LIGHT_SETCALENDAR("鍗曠伅璁剧疆鏃ュ巻"),
LIGHT_ERROR_LIST("鍗曠伅鏁呴殰鍒楄〃"),
LED_LIST("LED灞忓垪琛�"),
LED_PROGRAM_LIST("鑺傜洰鍒楄〃"),
PLAYPLAN_LIST("鎾斁璁″垝鍒楄〃"),
LED_FILE_S_LIST("LED灞忕礌鏉愬垪琛�"),
AIR_EQUIPMENT_LIST("澶ф皵璁惧鍒楄〃"),
+ AIR_EQUIPMENT_INFO("澶ф皵璁惧璇︽儏"),
AIR_DATA_LIST("澶ф皵鏁版嵁鍒楄〃"),
AIR_DATA_LIST_HISTORY("澶ф皵鏁版嵁鍘嗗彶"),
AIR_EQUIPMENT_NONG_GENG_LIST("澶ф皵璁惧鍐滆�曞垪琛�"),
- AIR_DATA__NONG_GENG_LIST("澶ф皵鏁版嵁鍐滆�曞垪琛�"),
WATER_EQUIPMENT_LIST("姘磋川璁惧鍒楄〃"),
WATER_DATA_LIST("姘磋川鏁版嵁鍒楄〃"),
IP_BROADCAST_LIST("IP闊虫煴鍒楄〃"),
@@ -63,6 +64,7 @@
BANNER("寰俊logo"),
POLE_LIST("鐏潌鍒楄〃"),
LIGHT_POLE_HEELING_LIST("鐏潌鍊炬枩"),
+ MQTT_TEST("MQTT娴嬭瘯"),
//鎸夐挳鏉冮檺
ADMIN_ADD("鏂板绠＄悊鍛�"),
@@ -73,6 +75,7 @@
AIR_QUERYVERSION("鏌ヨ杞‖浠剁増鏈�"),
AIR_REBOOT("杞噸鍚�"),
AIR_DATA_UPDATE("鎵嬪姩鏇存柊澶ф皵鏁版嵁"),
+ AIR_SET_TYPE("璁剧疆鍐滆�曡澶囩被鍨�"),
BANNER_ADD("娣诲姞寰俊logo"),
BANNER_UPDATE("缂栬緫寰俊logo"),
BANNER_DETAIL("鑾峰彇寰俊logo璇︽儏"),
@@ -129,6 +132,12 @@
LED_N_PLAY_PLAN_UPDATE("缂栬緫璇虹摝璁″垝"),
LED_N_PLAY_PLAN_DETELE("鍒犻櫎璇虹摝璁″垝"),
LED_N_PLAY_PLAN_PUSH("鎺ㄩ�佽鐡﹁鍒�"),
+ LED_N_GROUP_ADD("璇虹摝鍒嗙粍鏂板"),
+ LED_N_GROUP_UPDATE("璇虹摝鍒嗙粍缂栬緫"),
+ LED_N_GROUP_DEL("璇虹摝鍒嗙粍鍒犻櫎"),
+ LED_N_GROUP_LIST("璇虹摝鍒嗙粍鍒楄〃"),
+ LED_N_GROUP_BIND("璇虹摝鍒嗙粍缁戝畾"),
+ LED_N_GROUP_INFO("璇虹摝鍒嗙粍璇︽儏"),
LED_N_PLAY_PLAN_PUSH_SCHEDULE("鎺ㄩ�佽鐡﹀畾鏃�"),
POLE_VIRTUAL_ADD("鏂板铏氭嫙鐏潌"),
POLE_UPDATE("缂栬緫鐏潌"),
@@ -139,6 +148,7 @@
UNBIND("瑙ｇ粦璁惧"),
GET_STATE_BY_DEVICECODE("鎵归噺鑾峰彇璁惧鐘舵��"),
CLIENT_BINDING_POLE("鐏潌缁戝畾瀹㈡埛"),
+ CLIENT_UNBINDING_POLE("鐏潌瑙ｇ粦瀹㈡埛"),
GET_CLIENT_POLE("鏌ョ湅瀹㈡埛鐨勭伅鏉�"),
GET_POLE_BINDING("鏌ョ湅鐏潌缁戝畾鐨勮澶�"),
PUSH_AIR_DATA_TO_NOVA("鎺ㄩ�佸ぇ姘旀暟鎹埌璇虹摝"),
@@ -224,9 +234,19 @@
C3_REFUND("鍏呯數妗╅��娆�"),
CHARGE_UPDATE("缂栬緫璐圭巼"),
ORDER_LIST("璁㈠崟鍒楄〃"),
- CHARGE_LIST("鑾峰彇璐圭巼")
-
-
+ CHARGE_LIST("鑾峰彇璐圭巼"),
+ LED_NEW_FILE_UPLOAD("鏂拌鐡︽枃浠朵笂浼�"),
+ LED_NEW_FILE_LIST("鏂拌鐡︽枃浠跺垪琛�"),
+ LED_NEW_FILE_ADD("鏂拌鐡︽枃浠舵柊澧�"),
+ LED_NEW_FILE_DEL("鏂拌鐡︽枃浠跺垹闄�"),
+ LED_NEW_ADD("鏂拌鐡﹀睆骞曟柊澧�"),
+ LED_NEW_EDIT("鏂拌鐡﹀睆骞曠紪杈�"),
+ LED_NEW_DEL("鏂拌鐡﹀睆骞曞垹闄�"),
+ LED_NEW_LIST("鏂拌鐡﹀睆骞曞垪琛�"),
+ LED_NEW_INFO("鏂拌鐡﹀睆骞曡鎯�"),
+ LED_NEW_VOL("鏂拌鐡﹂煶閲忚皟鑺�"),
+ LED_NEW_BRIGHTNESS("鏂拌鐡︿寒搴﹁皟鑺�"),
+ LED_NEW_POWER("鏂拌鐡﹀紑鍏宠皟鑺�"),
;
--
Gitblit v1.9.3