diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java index 870d188..c7ce9cf 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java @@ -1,6 +1,7 @@ package com.sz.admin.monitor.controller; +import cn.dev33.satoken.annotation.SaIgnore; import com.sz.admin.monitor.pojo.dto.file.FileEntityDTO; import com.sz.admin.monitor.pojo.dto.file.FileStorageDTO; import com.sz.admin.monitor.pojo.que.file.FileStorageQue; @@ -40,6 +41,7 @@ public class FileController { } @GetMapping("/getPreviewFile/{id}") + @SaIgnore public ResponseEntity getPreviewFile(@PathVariable String id){ return fileService.getPreviewFile(id); } diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/que/file/FileStorageQue.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/que/file/FileStorageQue.java index a585f06..0bf445b 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/que/file/FileStorageQue.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/que/file/FileStorageQue.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.util.Date; + /** * @author xq * @description: diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/FileServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/FileServiceImpl.java index a1222b1..bfa1397 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/FileServiceImpl.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/FileServiceImpl.java @@ -99,13 +99,16 @@ public class FileServiceImpl { QueryWrapper queryWrapper = QueryWrapper.create() .from(FileStorageDO.class) .eq(FileStorageDO.ID, que.getId(), ObjectUtil.isNotEmpty(que.getId())) - .like(FileStorageDO.FILE_NAME, que.getFileName(), ObjectUtil.isNotEmpty(que.getFileName())) - .between( + .like(FileStorageDO.FILE_NAME, que.getFileName(), ObjectUtil.isNotEmpty(que.getFileName())); + if (ObjectUtil.isNotEmpty(que.getStartTime()) && ObjectUtil.isNotEmpty(que.getEndTime())) { + queryWrapper.between( FileStorageDO.ADD_TIME, - que.getStartTime(), que.getEndTime(), - ObjectUtil.isNotEmpty(que.getStartTime()) && ObjectUtil.isNotEmpty(que.getEndTime()) - ) - .orderBy(FileStorageDO.ADD_TIME, false); + new Date(que.getStartTime()), + new Date(que.getEndTime()) + ); + } + queryWrapper.orderBy(FileStorageDO.ADD_TIME, false); + Page page = fileStorageService.pageAs(PageUtils.getPage(que), queryWrapper, FileStorageDO.class);// 调试sql if (ObjectUtil.isEmpty(page) || page.getRecords().isEmpty()) diff --git a/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql b/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql index e0be65c..2561ad7 100644 --- a/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql +++ b/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql @@ -59,7 +59,7 @@ create table file_storage file_size varchar(32) null comment '文件大小', file_name varchar(32) null comment '文件名称', file_suffix varchar(128) null comment '文件后缀', - add_time date null comment '添加时间' + add_time datetime null comment '添加时间' ) comment '文件存储'; @@ -71,3 +71,4 @@ create table file_storage +