From 3f83b1735c7f0b42f59255d5bee035dcb10d0807 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 24 Feb 2026 15:51:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/page/BaseQuery.java | 4 ++-- .../file/controller/DevFileController.java | 12 ++++++---- .../modular/file/param/DevFilePageParam.java | 5 +++- .../dev/modular/file/param/DevFileQuery.java | 24 +++++++++++++++++++ 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/param/DevFileQuery.java diff --git a/nl-common/src/main/java/org/nl/common/page/BaseQuery.java b/nl-common/src/main/java/org/nl/common/page/BaseQuery.java index f59e356..7ee5280 100644 --- a/nl-common/src/main/java/org/nl/common/page/BaseQuery.java +++ b/nl-common/src/main/java/org/nl/common/page/BaseQuery.java @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap; */ @Data public abstract class BaseQuery { - private String blurry; + private String searchKey; private String is_used; private String start_time; private String end_time; @@ -27,7 +27,7 @@ public abstract class BaseQuery { */ @JsonIgnore protected Map fieldMappings = new HashMap() {{ - put("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build()); + put("searchKey", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build()); put("start_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LT).build()); put("end_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LE).build()); put("sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build()); diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/controller/DevFileController.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/controller/DevFileController.java index d285e80..a3672ac 100644 --- a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/controller/DevFileController.java +++ b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/controller/DevFileController.java @@ -21,14 +21,12 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import org.nl.common.annotation.CommonLog; +import org.nl.common.page.PageQuery; import org.nl.common.pojo.CommonResult; import org.nl.dev.api.DevConfigApi; import org.nl.dev.modular.file.entity.DevFile; import org.nl.dev.modular.file.enums.DevFileEngineTypeEnum; -import org.nl.dev.modular.file.param.DevFileIdParam; -import org.nl.dev.modular.file.param.DevFileListParam; -import org.nl.dev.modular.file.param.DevFilePageParam; -import org.nl.dev.modular.file.param.DevFileUrlListParam; +import org.nl.dev.modular.file.param.*; import org.nl.dev.modular.file.service.DevFileService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; @@ -273,4 +271,10 @@ public class DevFileController { public void download(@RequestParam String storageId , HttpServletResponse response, HttpServletRequest request) throws IOException { this.devFileService.downloadFile(this.devFileService.getById(storageId),request, response); } + + @Operation(summary = "获取文件列表") + @GetMapping("/api/localStorage/page") + public CommonResult> pageList(DevFileQuery devFilePageParam, PageQuery pageQuery) { + return CommonResult.data(devFileService.page(pageQuery.build(),devFilePageParam.build())); + } } diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/param/DevFilePageParam.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/param/DevFilePageParam.java index 8176888..cc3e1eb 100644 --- a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/param/DevFilePageParam.java +++ b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/param/DevFilePageParam.java @@ -12,9 +12,11 @@ */ package org.nl.dev.modular.file.param; +import cn.hutool.core.util.ObjectUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; +import org.nl.dev.modular.file.entity.DevFile; /** * 文件分页列表参数 @@ -25,7 +27,6 @@ import lombok.Setter; @Getter @Setter public class DevFilePageParam { - /** 文件引擎 */ @Schema(description = "文件引擎") private String engine; @@ -33,4 +34,6 @@ public class DevFilePageParam { /** 文件名关键词 */ @Schema(description = "文件名关键词") private String searchKey; + + } diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/param/DevFileQuery.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/param/DevFileQuery.java new file mode 100644 index 0000000..3d5d160 --- /dev/null +++ b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/param/DevFileQuery.java @@ -0,0 +1,24 @@ +package org.nl.dev.modular.file.param; + +import io.swagger.v3.oas.annotations.media.Schema; +import org.nl.common.page.BaseQuery; +import org.nl.dev.modular.file.entity.DevFile; + +public class DevFileQuery extends BaseQuery { + /** 文件引擎 */ + @Schema(description = "文件引擎") + private String engine; + + /** 文件名关键词 */ + @Schema(description = "文件名关键词") + private String searchKey; + @Override + protected Class getEntityClass() { + return DevFile.class; + } + +// @Override +// public void paramMapping() { +// super.fieldMappings.put("searchKey", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.EQ).build()); +// } +}