From d5dab0a85de9573ff61e20794af04129dd4b2f87 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 01 八月 2022 18:30:24 +0800
Subject: [PATCH] 大气设备

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

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 621da8e..03e6259 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
@@ -7,7 +7,6 @@
 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;
@@ -19,7 +18,7 @@
  * @Author liuhaonan
  * @Date 2021/12/21 11:35
  * @Version 1.0
- * LED鏂囦欢澶勭悊
+ * 璇虹摝LED鏂囦欢澶勭悊
  */
 @RestController
 @AllArgsConstructor
@@ -31,24 +30,32 @@
 
     @PostMapping("/add")
     public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramFileParam param) {
+        if (!permissionConfig.check(MenuEnum.LED_FILE_N_ADD.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(ledProgramFileService.addProgramFile(param));
     }
 
     @PostMapping("/delete/{fileId}")
     public ResponseVO<Object> deleteLEDProgram(@PathVariable Long fileId) {
+        if (!permissionConfig.check(MenuEnum.LED_FILE_N_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(ledProgramFileService.deleteFile(fileId));
     }
 
     @GetMapping("/list")
     public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
-        if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+        if (!permissionConfig.check(MenuEnum.LED_FILE_S_LIST.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
-        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
         LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
-        if(null!=keyword){
-            wrapper.like(LEDProgramFile::getName,keyword);
+        if (keyword != null&&!keyword.isEmpty()) {
+            wrapper.like(LEDProgramFile::getName, keyword);
         }
+
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         return ResponseUtil.successPage(ledProgramFileService.list(wrapper));
     }
 

--
Gitblit v1.9.3