From 42190b82f67483e3db3b5b1a66ddc8bdbd22a3ca Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 15 四月 2022 10:55:37 +0800
Subject: [PATCH] 用户权限

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java               |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java          |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java             |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java            |   12 ++
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java                |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java              |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java                 |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java            |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java                  |    5 
 dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java                                       |   62 +++++++++++++++
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java      |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java            |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java                  |    3 
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java                 |   12 +++
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java               |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java        |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java                 |   15 +++
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java          |   10 +-
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java                  |    3 
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java             |    7 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java                 |    8 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java                |    7 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java      |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java       |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java          |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java           |    6 +
 27 files changed, 225 insertions(+), 15 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
new file mode 100644
index 0000000..e1158e1
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
@@ -0,0 +1,62 @@
+package com.sandu.ximon.dao.enums;
+
+/**
+ * 鏉冮檺绠＄悊鏋氫妇绫�
+ *
+ * @author ZZQ
+ * @date 2022/4/15 10:02
+ */
+public enum MenuEnum {
+    USER_MANAGER("瀹㈡埛绠＄悊"),
+    POLE_MANAGER("鐏潌绠＄悊"),
+    LIGHT_MANAGER("璺伅绠＄悊"),
+    LED_MANAGER("LED灞忕鐞�"),
+    C3_CHARGING_MANAGER("鍏呯數妗╃鐞�"),
+    AIR_EQUIPMENT_MANAGER("澶ф皵璁惧绠＄悊"),
+    WATER_EQUIPMENT_MANAGER("姘磋川璁惧绠＄悊"),
+    IP_BROADCAST_MANAGER("IP骞挎挱绠＄悊"),
+    LIGHT_POLE_HEELING_MANAGER("鐏潌鍊炬枩绠＄悊"),
+    FOR_HELP_MANAGER("涓�閿眰鍔╃鐞�"),
+    MONITOR_MANAGER("鎽勫儚澶寸鐞�"),
+    BANNER_MANAGER("鍐呭绠＄悊"),
+    ADMIN_MANAGER("绠＄悊鍛樼鐞�"),
+    SYSTEM_SETTINGS("绯荤粺璁剧疆"),
+    CLIENT_LIST("瀹㈡埛鍒楄〃"),
+    LIGHT_LIST("璺伅鍒楄〃"),
+    GROUP_LIST("鍒嗙粍鍒楄〃"),
+    LIGHT_TASK_LIST("璺伅浠诲姟鍒楄〃"),
+    LIGHT_DATA("鍗曠伅鐩戞帶鏁版嵁"),
+    LIGHT_ERROR_LIST("鍗曠伅鏁呴殰鍒楄〃"),
+    LED_LIST("LED灞忓垪琛�"),
+    LED_PROGRAM_LIST("鑺傜洰鍒楄〃"),
+    PLAYPLAN_LIST("鎾斁璁″垝鍒楄〃"),
+    LED_FILE_LIST("LED灞忕礌鏉愬垪琛�"),
+    AIR_EQUIPMENT_LIST("澶ф皵璁惧鍒楄〃"),
+    AIR_DATA_LIST("澶ф皵鏁版嵁鍒楄〃"),
+    WATER_EQUIPMENT_LIST("姘磋川璁惧鍒楄〃"),
+    WATER_DATA_LIST("姘磋川鏁版嵁鍒楄〃"),
+    IP_BROADCAST_LIST("IP闊虫煴鍒楄〃"),
+    IP_BROADCAST_TASK_LIST("闊虫煴浠诲姟鍒楄〃"),
+    IP_BROADCAST_FILE_LIST("骞挎挱绱犳潗鍒楄〃"),
+    MONITOR_LIST("鎽勫儚澶村垪琛�"),
+    ADMIN_LIST("绠＄悊鍛樺垪琛�"),
+    MENU_LIST("鑿滃崟鍒楄〃"),
+    C3_CHARGING_LIST("鍏呯數妗╁垪琛�"),
+    ROLE_MANAGER("瑙掕壊绠＄悊"),
+    PAY_CONFIG("鏀粯閰嶇疆"),
+    BANNER("寰俊logo"),
+    POLE_LIST("鐏潌鍒楄〃"),
+    LIGHT_POLE_HEELING_LIST("鐏潌鍊炬枩");
+
+
+    private final String code;
+
+    MenuEnum(String code) {
+        this.code = code;
+    }
+
+
+    public String getCode() {
+        return code;
+    }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 49b96c0..be50dac 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -25,10 +25,12 @@
 import com.sandu.ximon.admin.param.AdminParam;
 import com.sandu.ximon.admin.param.PwdParam;
 import com.sandu.ximon.admin.param.ReceiveParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.*;
 import com.sandu.ximon.dao.domain.*;
 import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.GrantedAuthority;
@@ -59,6 +61,7 @@
     private final RoleService roleService;
     private final TokenProvider tokenProvider;
     private final AdminRoleRelationService adminRoleRelationService;
+    private PermissionConfig permissionConfig;
 
     @Log("鍚庡彴鐢ㄦ埛鐧诲綍")
     @AnonymousAccess
@@ -135,6 +138,9 @@
     @Log("鍚庡彴鐢ㄦ埛鍒楄〃")
     @GetMapping(value = "/list")
     public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
         if (keyword != null) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
index b65653d..869765b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -10,8 +10,10 @@
 import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
 import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.AirDataService;
 import com.sandu.ximon.dao.bo.AirDataBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +30,7 @@
 @RequestMapping("/v1/admin/airdata")
 public class AirDataController {
     private final AirDataService airDataService;
+    private PermissionConfig permissionConfig;
 
     /**
      * 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
@@ -37,6 +40,9 @@
      */
     @GetMapping("/listAirData")
     public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<AirDataBo> list = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
         return ResponseUtil.successPage(list);
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
index a096766..d53c732 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
@@ -3,8 +3,10 @@
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.AirEquipmentService;
 import com.sandu.ximon.dao.bo.AirEquipmentBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,6 +20,7 @@
 @RequestMapping("/v1/admin/airequipment")
 public class AirEquipmentController {
     private final AirEquipmentService airEquipmentService;
+    private PermissionConfig permissionConfig;
 
     /**
      * 鏌ヨ澶ф皵璁惧
@@ -26,6 +29,9 @@
      */
     @GetMapping("/listAirEquipment")
     public ResponseVO<Object> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<AirEquipmentBo> list = airEquipmentService.listAirEquipmentByKeyword(baseConditionVO, keyword);
         return ResponseUtil.successPage(list);
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
index c41544d..5d24770 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
@@ -5,11 +5,13 @@
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.dto.BannerDto;
 import com.sandu.ximon.admin.param.BannerParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.BannerService;
 import com.sandu.ximon.admin.service.ClientService;
 import com.sandu.ximon.dao.domain.Banner;
 import com.sandu.ximon.dao.domain.Client;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,7 @@
 
     private final BannerService contentBannerService;
     private final ClientService clientService;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/addbanner")
     public ResponseVO<Object> addBanner(@Validated @RequestBody BannerParam bannerParam) {
@@ -64,6 +67,9 @@
 
     @GetMapping
     public ResponseVO<Object> listMainBanner() {
+        if (!permissionConfig.check(MenuEnum.BANNER.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         if (SecurityUtils.getClientId() != null) {
             List<Banner> list = contentBannerService.listBanner();
             return ResponseUtil.success(list);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
index ab3b26d..1ee8435 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -5,7 +5,9 @@
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.C3ChargingAddParam;
 import com.sandu.ximon.admin.param.C3ChargingParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.C3ChargingService;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -21,10 +23,14 @@
 @RequestMapping("/v1/admin/C3Charging")
 public class C3ChargingController {
     private C3ChargingService c3ChargingService;
+    private PermissionConfig permissionConfig;
 
 
     @PostMapping("/C3ChargingList")
     public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
+        if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
     }
 
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 7364182..63e8e4a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -18,6 +18,7 @@
 import com.sandu.ximon.admin.param.AdminLoginParam;
 import com.sandu.ximon.admin.param.ResetClientPasswordPrarm;
 import com.sandu.ximon.admin.param.UpdateClientPrarm;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.ClientRoleRelationService;
 import com.sandu.ximon.admin.service.ClientService;
@@ -25,6 +26,7 @@
 import com.sandu.ximon.dao.domain.Client;
 import com.sandu.ximon.dao.domain.ClientRoleRelation;
 import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -49,6 +51,7 @@
     private final RoleService roleService;
     private final ClientRoleRelationService clientRoleRelationService;
     private final TokenProvider tokenProvider;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
@@ -93,6 +96,10 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.CLIENT_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
         if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
index 1995044..71f23a2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
@@ -4,8 +4,10 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.IpVolumeService;
 import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,6 +23,7 @@
 @RequestMapping("/v1/IPColumn")
 public class IPBroadcastController {
     private IpVolumeService broadcastTerminalV2Service;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/synchTerminal")
     public ResponseVO<Object> synchTerminal() {
@@ -31,6 +34,9 @@
     @PostMapping("/getBroadcastTerminalList")
     public ResponseVO<Object> getBroadcastTerminalList(BaseConditionVO baseConditionVO,
                                                        @RequestBody(required = false) BroadcastTerminalV2Param broadcastTerminalV2Param) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<BroadcastTerminalV2EntityBo> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, broadcastTerminalV2Param);
 
         if (2 != broadcastTerminalV2Param.getWorkState()) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index ce53f53..5242cd1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -5,15 +5,15 @@
 import com.github.pagehelper.PageHelper;
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.execption.BusinessException;
-import com.sandu.common.file.impl.LocalFileUploadImpl;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.IpVolumeFileParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.BroadcastV2TaskFileService;
-import com.sandu.ximon.admin.service.FileOperationRecordService;
 import com.sandu.ximon.admin.service.IpVolumeFileService;
 import com.sandu.ximon.dao.domain.BroadcastV2TaskFile;
 import com.sandu.ximon.dao.domain.IpVolumeFile;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -33,8 +33,7 @@
 
     private final IpVolumeFileService ipVolumeFileService;
     private final BroadcastV2TaskFileService v2TaskFileService;
-    private final FileOperationRecordService fileOperationRecordService;
-    private final LocalFileUploadImpl fileUpload;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addFile(@RequestBody @Validated IpVolumeFileParam fileParam) {
@@ -52,6 +51,9 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
       /*  if (null != keyword) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
index f28ed0d..251bf38 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
@@ -7,9 +7,11 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.IpVolumeMissionParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.IpVolumeMissionService;
 import com.sandu.ximon.dao.domain.IpVolumeMission;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,6 +25,7 @@
 @RequestMapping("/v1/volumeMission")
 public class IpVolumeMissionController {
     private final IpVolumeMissionService ipVolumeMissionService;
+    private PermissionConfig permissionConfig;
 
 
     /**
@@ -89,6 +92,9 @@
     // @AnonymousAccess
     @GetMapping("/list")
     public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());// todo
 //        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO,keyword));
         if (SecurityUtils.getClientId() == null) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
index 1b94ea3..51eaaec 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -7,8 +7,10 @@
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.LEDProgramParam;
 import com.sandu.ximon.admin.param.ReceiveParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.LEDProgramService;
 import com.sandu.ximon.dao.domain.LEDProgram;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +23,7 @@
 @RequestMapping("/v1/LEDProgram")
 public class LEDProgramController {
     private final LEDProgramService ledProgramService;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
@@ -29,7 +32,7 @@
 
     @PostMapping("/update/{pid}")
     public ResponseVO<Object> updateLEDProgram(@PathVariable Long pid, @RequestBody @Validated LEDProgramParam ledProgramParam) {
-        return ResponseUtil.success(ledProgramService.updateProgram(pid,ledProgramParam));
+        return ResponseUtil.success(ledProgramService.updateProgram(pid, ledProgramParam));
     }
 
     @GetMapping("/getbypid/{pid}")
@@ -46,10 +49,13 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listProgram(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.LED_PROGRAM_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
-        if(null!=keyword){
-            wrapper.like(LEDProgram::getName,keyword);
+        if (null != keyword) {
+            wrapper.like(LEDProgram::getName, keyword);
         }
         return ResponseUtil.successPage(ledProgramService.list(wrapper));
 
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
index 1b369ab..621da8e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
@@ -6,9 +6,11 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.LEDProgramFileParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.LEDProgramFileService;
 import com.sandu.ximon.dao.domain.LEDProgramFile;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,7 @@
 public class LEDProgramFileController {
 
     private final LEDProgramFileService ledProgramFileService;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramFileParam param) {
@@ -38,6 +41,9 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
         if(null!=keyword){
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
index 014cf2b..d5043af 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -7,10 +7,12 @@
 import com.sandu.common.file.impl.AliOssFileServiceImpl;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.FileOperationRecordService;
 import com.sandu.ximon.admin.service.LedSFileService;
 import com.sandu.ximon.dao.domain.FileOperationRecord;
 import com.sandu.ximon.dao.domain.LedSFile;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -31,6 +33,7 @@
     private final LedSFileService ledProgramFileService;
     private final AliOssFileServiceImpl aliOssFileService;
     private final FileOperationRecordService fileOperationRecordService;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addLEDProgram(@RequestParam("file") MultipartFile file) {
@@ -46,6 +49,9 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
         if (null != keyword) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index edbeb8e..bac7ce1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -5,12 +5,14 @@
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.LightControlParam;
 import com.sandu.ximon.admin.param.LightRemarkParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.LightReportDataService;
 import com.sandu.ximon.admin.service.LightReportErrorService;
 import com.sandu.ximon.admin.service.LightService;
 import com.sandu.ximon.dao.bo.LightBo;
 import com.sandu.ximon.dao.bo.LightReportDataBo;
 import com.sandu.ximon.dao.bo.LightReportErrorBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -31,10 +33,14 @@
     private final LightService lightService;
     private final LightReportDataService lightReportDataService;
     private final LightReportErrorService lightReportErrorService;
+    private PermissionConfig permissionConfig;
 
 
     @GetMapping("/list")
     public ResponseVO<Object> listLight(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<LightBo> list = lightService.listLight(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
         return ResponseUtil.successPage(list);
     }
@@ -56,7 +62,11 @@
      * @return
      */
     @GetMapping("/report/list")
-    public ResponseVO<Object> listReportData(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
+    public ResponseVO<Object> listReportData(BaseConditionVO conditionVO
+            , @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<LightReportDataBo> list = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
         return ResponseUtil.success(list);
     }
@@ -76,6 +86,9 @@
 
     @GetMapping("/error/list")
     public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_ERROR_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<LightReportErrorBo> list = lightReportErrorService.listReportError(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
         return ResponseUtil.success(list);
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
index 8d4aedf..ca4b4f0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
@@ -6,8 +6,10 @@
 import com.sandu.ximon.admin.param.C3ChargingParam;
 import com.sandu.ximon.admin.param.LightPoleHeelingListParam;
 import com.sandu.ximon.admin.param.LightPoleHeelingParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.LightPoleHeelingService;
 import com.sandu.ximon.dao.domain.LightPoleHeeling;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,6 +24,7 @@
 @RequestMapping("/v1/admin/LightPoleHeeling")
 public class LightPoleHeelingController {
     private final LightPoleHeelingService lightPoleHeelingService;
+    private PermissionConfig permissionConfig;
 
     /**
      * 妯＄硦鏌ヨ
@@ -31,6 +34,9 @@
     @PostMapping("/listLightPoleHeelingByKeyword")
     public ResponseVO<Object> listLightPoleHeelingByKeyword(BaseConditionVO baseConditionVO
             , @RequestBody(required = false) LightPoleHeelingListParam lightPoleHeelingListParam) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<LightPoleHeeling> list = lightPoleHeelingService.listLightPoleHeelingByKeyword(baseConditionVO, lightPoleHeelingListParam);
         return ResponseUtil.successPage(list);
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
index 7ee9900..a705fca 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
@@ -7,8 +7,10 @@
 import com.sandu.ximon.admin.param.LightTaskDelParam;
 import com.sandu.ximon.admin.param.LightTaskIssueParam;
 import com.sandu.ximon.admin.param.LightTaskParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.LightTaskService;
 import com.sandu.ximon.dao.domain.LightTask;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +29,7 @@
 public class LightTaskController {
 
     private final LightTaskService lightTaskService;
-
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addLightTask(@RequestBody @Validated LightTaskParam param) {
@@ -41,6 +43,9 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
         return ResponseUtil.successPage(taskList);
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
index b3181cd..491cff1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
@@ -6,6 +6,7 @@
 import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.MenuService;
 import com.sandu.ximon.dao.bo.MenuNode;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +37,7 @@
     @GetMapping("/treeList")
     public ResponseVO<Object> treeList() {
 
-        if(!permissionConfig.check("鑿滃崟鍒楄〃")){
+        if(!permissionConfig.check(MenuEnum.MENU_LIST.getCode())){
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
         List<MenuNode> menuTrees = menuService.treeList();
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
index eac56c2..9a9b077 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -6,9 +6,11 @@
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.dto.YSY_MonitorDto;
 import com.sandu.ximon.admin.param.MonitorParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.MonitorService;
 import com.sandu.ximon.dao.bo.MonitorBo;
 import com.sandu.ximon.dao.domain.Monitor;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import com.sandu.ximon.dao.mapper.MonitorMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,7 @@
     private final MonitorService monitorService;
 
     private final MonitorMapper monitorMapper;
+    private PermissionConfig permissionConfig;
 
 
     /**
@@ -40,6 +43,9 @@
 //        } else {
 //            list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
 //        }
+        if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
 
         List<String> list;
         list = monitorMapper.listMonitorDeviceSerial();
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
index 6f3c548..c17c2b1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -9,11 +9,13 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.PlayPlanParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.PlayPlanNvService;
 import com.sandu.ximon.dao.domain.Client;
 import com.sandu.ximon.dao.domain.PlayPlanNv;
 import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +33,7 @@
 @RequestMapping("/v1/ledPlan")
 public class PlayPlanNvController {
     private final PlayPlanNvService playPlanNvService;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addLEDPlan(@RequestBody @Validated PlayPlanParam param) {
@@ -59,6 +62,9 @@
 
     @GetMapping("/listPlan")
     public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.PLAYPLAN_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<PlayPlanNv> wrapper = new LambdaQueryWrapper<>();//
         if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index 0f43a70..fe7300e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -18,6 +18,7 @@
 import com.sandu.ximon.admin.service.MonitorService;
 import com.sandu.ximon.admin.service.PoleService;
 import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -57,7 +58,7 @@
 
     @PostMapping("/list")
     public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
-        if(!permissionConfig.check("璺伅鍒楄〃")){
+        if(!permissionConfig.check(MenuEnum.POLE_LIST.getCode())){
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
index 1c04965..9202799 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
@@ -6,7 +6,9 @@
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.PoleGroupParam;
 import com.sandu.ximon.admin.param.PoleGroupRelationParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.PoleGroupService;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +26,7 @@
 public class PoleGroupController {
 
     private final PoleGroupService poleGroupService;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addGroup(@RequestBody @Validated PoleGroupParam param) {
@@ -43,6 +46,9 @@
     @GetMapping("/list")
     public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
                                         @RequestParam(value = "groupid", required = false) Long groupid) {
+        if (!permissionConfig.check(MenuEnum.GROUP_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
index a80900d..ba50739 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
@@ -1,6 +1,5 @@
 package com.sandu.ximon.admin.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
@@ -9,8 +8,8 @@
 import com.sandu.ximon.admin.service.RoleService;
 import com.sandu.ximon.dao.domain.Role;
 import com.sandu.ximon.dao.domain.RoleDetail;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,7 +38,7 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listRole(BaseConditionVO conditionVO) {
-        if (!permissionConfig.check("瑙掕壊绠＄悊")) {
+        if (!permissionConfig.check(MenuEnum.ROLE_MANAGER.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
 
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
index 1943139..8f8f570 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
@@ -9,8 +9,10 @@
 import com.sandu.ximon.admin.param.WxpayConfigParam;
 import com.sandu.ximon.admin.pay.alipay.UsrAlipayConfigService;
 import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.dao.domain.AliConfigEntity;
 import com.sandu.ximon.dao.domain.WxConfigEntity;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +29,7 @@
 
     private final UsrAlipayConfigService alipayConfigService;
     private final UsrWxPayConfigService wxPayConfigService;
+    private PermissionConfig permissionConfig;
 
 
     /**
@@ -163,6 +166,9 @@
     @GetMapping("/WxConfigList")
     public ResponseVO<Object> WxConfigList(BaseConditionVO baseConditionVO
             , @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.PAY_CONFIG.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         return ResponseUtil.success(wxPayConfigService.configList(baseConditionVO, keyword));
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index ba5b236..96b6c1c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -7,6 +7,7 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.VnnoxParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.LedPlayerEntityService;
 import com.sandu.ximon.admin.service.PoleBindingService;
@@ -18,6 +19,7 @@
 import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
 import com.sandu.ximon.dao.domain.PoleBinding;
 import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,7 +38,8 @@
 //@AllArgsConstructor
 @RequestMapping("/v1/Vnnox")
 public class VnnoxController {
-
+    @Autowired
+    private PermissionConfig permissionConfig;
     @Autowired
     private VnnoxService vnnoxService;
     @Autowired
@@ -134,6 +137,9 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<LedPlayerEntity> wrapper = Wrappers.lambdaQuery(LedPlayerEntity.class);
         if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
index ff26e09..a1317c0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
@@ -4,8 +4,10 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.dto.WaterQualityDataDto;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.WaterQualityDataService;
 import com.sandu.ximon.dao.bo.WaterQualityDataBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,6 +21,7 @@
 @RequestMapping("/v1/admin/waterqualitydata")
 public class WaterQualityDataController {
     private final WaterQualityDataService waterQualityDataService;
+    private PermissionConfig permissionConfig;
 
     /**
      * 姘磋川鏁版嵁鏌ヨ
@@ -27,6 +30,9 @@
      */
     @GetMapping("/listWaterQualityData")
     public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.WATER_DATA_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityDataByKeyword(baseConditionVO, keyword);
         return ResponseUtil.successPage(list);
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
index 3954610..dde756d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
@@ -4,9 +4,11 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.WaterQualityEquipmentService;
 import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
 import com.sandu.ximon.dao.domain.WaterQualityEquipment;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,6 +22,7 @@
 @RequestMapping("/v1/admin/waterqualityequipment")
 public class WaterQualityEquipmentController {
     private final WaterQualityEquipmentService waterQualityEquipmentService;
+    private PermissionConfig permissionConfig;
 
     /**
      * 姘磋川璁惧鍒楄〃鏌ヨ
@@ -28,6 +31,9 @@
      */
     @GetMapping("/listWaterQualityEquipment")
     public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(baseConditionVO, keyword);
         return ResponseUtil.successPage(list);
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 8bb5178..c572062 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -15,6 +15,7 @@
 import com.sandu.ximon.admin.param.SetBrightnessParam;
 import com.sandu.ximon.admin.param.SetScreenOpenParam;
 import com.sandu.ximon.admin.param.SetVolumeParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.*;
 import com.sandu.ximon.admin.utils.LightemitUtils;
@@ -23,6 +24,7 @@
 import com.sandu.ximon.dao.domain.PoleLightemitEntity;
 import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
 import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,6 +47,7 @@
     private final LedScheduleService scheduleService;
     private final PoleBindingService bindingService;
     private final PoleService poleService;
+    private PermissionConfig permissionConfig;
     // private final ListPageUtil listPageUtil;
 
     /**
@@ -109,6 +112,9 @@
      */
     @GetMapping("/list")
     public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.LED_PROGRAM_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
 
         LambdaQueryWrapper<PoleXixunPlayerEntity> wrapper = Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).like(PoleXixunPlayerEntity::getProgramName, keyword);
@@ -210,6 +216,9 @@
     @GetMapping("/listLed")
     public ResponseVO<Object> listLed(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
                                       @RequestParam(value = "isOnLine", required = false) boolean isOnLine) {
+        if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<PoleLightemitEntity> wrapper = Wrappers.lambdaQuery(PoleLightemitEntity.class);
         if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
@@ -429,6 +438,9 @@
 
     @GetMapping("/listSchedule")
     public ResponseVO<Object> listSchedule(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.PLAYPLAN_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         return ResponseUtil.success(scheduleService.listSchedule(baseConditionVO, keyword));
     }

--
Gitblit v1.9.3