From c3f5966e89e0f4b27442f523585c10c9a547d7ed Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 02 六月 2022 10:57:27 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
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 10ac90a..bb3e406 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
@@ -4,23 +4,17 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.enums.FileStorageEnums;
import com.sandu.common.execption.BusinessException;
-import com.sandu.common.file.FileUploadDto;
-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.param.ReceiveParam;
+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.FileOperationRecord;
import com.sandu.ximon.dao.domain.IpVolumeFile;
-import com.sandu.ximon.dao.domain.LedSFile;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -39,44 +33,48 @@
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){
+ public ResponseVO<Object> addFile(@RequestBody @Validated IpVolumeFileParam fileParam) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeFileService.addFile(fileParam));
}
@PostMapping("/delete/{fileId}")
- public ResponseVO<Object> deleteFile(@PathVariable Long fileId){
+ public ResponseVO<Object> deleteFile(@PathVariable Long fileId) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<BroadcastV2TaskFile> list = v2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class).eq(BroadcastV2TaskFile::getFileId, fileId));
- if(list.size()!=0){
+ if (list.size() != 0) {
throw new BusinessException("姝ゆ枃浠舵鍦ㄨ鍏朵粬浠诲姟鍗犵敤");
}
return ResponseUtil.success(ipVolumeFileService.deleteFile(fileId));
}
@GetMapping("/list")
- public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword){
- LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- /* if (null != keyword) {
- wrapper.like(IpVolumeFile::getFileName, keyword);
- }*/
- return ResponseUtil.success(ipVolumeFileService.list(wrapper));
+ public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
+ List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.ipVolumeFileList(baseConditionVO, keyword, order, seq);
+
+ return ResponseUtil.success(ipVolumeFiles);
}
+
@PostMapping("/IpVolumeFileUploading")
public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file) {
- FileUploadDto fileUploadDto = fileUpload.uploadFile(file);
-
- FileOperationRecord fileOperationRecord = new FileOperationRecord();
-// if("mp4".equals(fileUploadDto.getFileType())){
-// fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
-// }
- BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
- fileOperationRecord.setDataType(3);
- fileOperationRecordService.save(fileOperationRecord);
- return ResponseUtil.success(fileUploadDto);
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_UPLOADING.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(ipVolumeFileService.upload(file));
}
}
--
Gitblit v1.9.3