From a015509816d8799b0f0f8eb945984067ba305dc5 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 18 四月 2022 10:17:12 +0800
Subject: [PATCH] 灯杆在线/离线总数
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 1dcd277..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) {
@@ -57,10 +63,13 @@
@PostMapping("/uploading/{dateType}")
public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file,@PathVariable Integer dateType) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
- FileOperationRecord fileOperationRecord = new FileOperationRecord();
if("mp4".equals(fileUploadDto.getFileType())){
fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
}
+ 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(dateType);
fileOperationRecordService.save(fileOperationRecord);
--
Gitblit v1.9.3