From 9157a7cd26d7a82a065e7afdc9b1ddfc6a62250b Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 15:00:55 +0800
Subject: [PATCH] 播放计划列表

---
 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..a3cbbae 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.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