From 53d4c0d723402840c3a591664a839f7ce044bd2d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 10:39:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
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 a3cbbae..80d72fa 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
@@ -6,6 +6,7 @@
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.FileOperationRecordService;
@@ -37,23 +38,28 @@
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestParam("file") MultipartFile file) {
-
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.addProgramFile(file));
// return ResponseUtil.success(aliOssFileService.uploadFile(file));
}
@PostMapping("/delete/{fileId}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long fileId) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
- if (!keyword.isEmpty()) {
+ if (keyword != null && !keyword.isEmpty()) {
wrapper.like(LedSFile::getOriginName, keyword);
}
--
Gitblit v1.9.3