From 4db02ec887a1f4322d08d9f4b9a5e7ad12f3cce7 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 26 四月 2022 16:41:20 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 d5043af..279640e 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
@@ -52,19 +52,20 @@
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) {
+ if (keyword != null && !keyword.isEmpty()) {
wrapper.like(LedSFile::getOriginName, keyword);
}
+
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
return ResponseUtil.success(ledProgramFileService.list(wrapper));
}
@PostMapping("/uploading/{dateType}")
- public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file,@PathVariable Integer dateType) {
+ public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file, @PathVariable Integer dateType) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
- if("mp4".equals(fileUploadDto.getFileType())){
- fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+ 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())){
--
Gitblit v1.9.3