data;
+
+ /**
+ * 分页元信息；非分页接口不显示此字段
+ */
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private Page page;
+
+ /**
+ * 构建分页结果（MyBatis-Plus {@link IPage}）。
+ *
+ * data 为当前页记录列表；page 提供分页元信息。
+ */
public static PageResult success(IPage page) {
PageResult result = new PageResult<>();
result.setCode(ResultCode.SUCCESS.getCode());
-
- Data data = new Data<>();
- data.setList(page.getRecords());
- data.setTotal(page.getTotal());
-
- result.setData(data);
result.setMsg(ResultCode.SUCCESS.getMsg());
+
+ List records =
+ (page == null || page.getRecords() == null)
+ ? Collections.emptyList()
+ : page.getRecords();
+ result.setData(records);
+
+ Page pageMeta = new Page();
+ pageMeta.setPageNum(page != null ? page.getCurrent() : 1L);
+ pageMeta.setPageSize(page != null ? page.getSize() : 0L);
+ pageMeta.setTotal(page != null ? page.getTotal() : 0L);
+ result.setPage(pageMeta);
+
return result;
}
- @lombok.Data
- public static class Data {
+ /**
+ * 构建列表结果（无分页）。
+ *
+ * page 置为 null，用于与分页返回区分。
+ */
+ public static PageResult success(List list) {
+ PageResult result = new PageResult<>();
+ result.setCode(ResultCode.SUCCESS.getCode());
+ result.setMsg(ResultCode.SUCCESS.getMsg());
+ result.setData(list != null ? list : Collections.emptyList());
+ result.setPage(null);
+ return result;
+ }
- private List list;
+ @Data
+ public static class Page {
+
+ private long pageNum;
+
+ private long pageSize;
private long total;
-
}
}
diff --git a/src/main/java/com/youlai/boot/core/web/Result.java b/src/main/java/com/youlai/boot/core/web/Result.java
index 6e4e6ac6..528c57bc 100644
--- a/src/main/java/com/youlai/boot/core/web/Result.java
+++ b/src/main/java/com/youlai/boot/core/web/Result.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
/**
* 统一响应结构体
*
- * @author Ray
+ * @author Ray.Hao
* @since 2022/1/30
**/
@Data
@@ -76,7 +76,4 @@ public class Result implements Serializable {
return result;
}
- public static boolean isSuccess(Result result) {
- return result != null && ResultCode.SUCCESS.getCode().equals(result.getCode());
- }
}
diff --git a/src/main/java/com/youlai/boot/platform/ai/controller/AiAssistantController.java b/src/main/java/com/youlai/boot/platform/ai/controller/AiAssistantController.java
index 1e8d6a1b..040db52c 100644
--- a/src/main/java/com/youlai/boot/platform/ai/controller/AiAssistantController.java
+++ b/src/main/java/com/youlai/boot/platform/ai/controller/AiAssistantController.java
@@ -6,7 +6,7 @@ import com.youlai.boot.core.web.Result;
import com.youlai.boot.platform.ai.model.dto.AiExecuteRequestDTO;
import com.youlai.boot.platform.ai.model.dto.AiParseRequestDTO;
import com.youlai.boot.platform.ai.model.dto.AiParseResponseDTO;
-import com.youlai.boot.platform.ai.model.query.AiAssistantPageQuery;
+import com.youlai.boot.platform.ai.model.query.AiAssistantQuery;
import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVO;
import com.youlai.boot.platform.ai.service.AiAssistantRecordService;
import io.swagger.v3.oas.annotations.Operation;
@@ -76,7 +76,7 @@ public class AiAssistantController {
@Operation(summary = "获取 AI 命令记录分页列表")
@GetMapping("/records")
- public PageResult getRecordPage(AiAssistantPageQuery queryParams) {
+ public PageResult getRecordPage(AiAssistantQuery queryParams) {
IPage page = aiAssistantRecordService.getRecordPage(queryParams);
return PageResult.success(page);
}
diff --git a/src/main/java/com/youlai/boot/platform/ai/mapper/AiAssistantRecordMapper.java b/src/main/java/com/youlai/boot/platform/ai/mapper/AiAssistantRecordMapper.java
index 140b1487..ca6668c5 100644
--- a/src/main/java/com/youlai/boot/platform/ai/mapper/AiAssistantRecordMapper.java
+++ b/src/main/java/com/youlai/boot/platform/ai/mapper/AiAssistantRecordMapper.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.platform.ai.model.entity.AiAssistantRecord;
-import com.youlai.boot.platform.ai.model.query.AiAssistantPageQuery;
+import com.youlai.boot.platform.ai.model.query.AiAssistantQuery;
import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVO;
import org.apache.ibatis.annotations.Mapper;
@@ -18,5 +18,5 @@ public interface AiAssistantRecordMapper extends BaseMapper {
* @param queryParams 查询参数
* @return 分页结果
*/
- IPage getRecordPage(Page page, AiAssistantPageQuery queryParams);
+ IPage getRecordPage(Page page, AiAssistantQuery queryParams);
}
diff --git a/src/main/java/com/youlai/boot/platform/ai/model/query/AiAssistantPageQuery.java b/src/main/java/com/youlai/boot/platform/ai/model/query/AiAssistantPageQuery.java
index 4d5cc552..4fc4083a 100644
--- a/src/main/java/com/youlai/boot/platform/ai/model/query/AiAssistantPageQuery.java
+++ b/src/main/java/com/youlai/boot/platform/ai/model/query/AiAssistantPageQuery.java
@@ -1,6 +1,6 @@
package com.youlai.boot.platform.ai.model.query;
-import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -16,7 +16,7 @@ import java.util.List;
@Schema(description = "AI 助手行为记录分页查询对象")
@Getter
@Setter
-public class AiAssistantPageQuery extends BasePageQuery {
+public class AiAssistantPageQuery extends BaseQuery {
@Schema(description = "关键字(原始命令/函数名称/用户名)")
private String keywords;
diff --git a/src/main/java/com/youlai/boot/platform/ai/model/query/AiAssistantQuery.java b/src/main/java/com/youlai/boot/platform/ai/model/query/AiAssistantQuery.java
new file mode 100644
index 00000000..03966ea7
--- /dev/null
+++ b/src/main/java/com/youlai/boot/platform/ai/model/query/AiAssistantQuery.java
@@ -0,0 +1,44 @@
+package com.youlai.boot.platform.ai.model.query;
+
+import com.youlai.boot.common.base.BaseQuery;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * AI 助手行为记录查询对象
+ *
+ * @author Ray.Hao
+ * @since 3.0.0
+ */
+@Schema(description = "AI 助手行为记录查询对象")
+@Getter
+@Setter
+public class AiAssistantQuery extends BaseQuery {
+
+ @Schema(description = "关键字(原始命令/函数名称/用户名)")
+ private String keywords;
+
+ @Schema(description = "执行状态(0-待执行, 1-成功, -1-失败)")
+ private Integer executeStatus;
+
+ @Schema(description = "用户ID")
+ private Long userId;
+
+ @Schema(description = "解析状态(0-失败, 1-成功)")
+ private Integer parseStatus;
+
+ @Schema(description = "创建时间范围")
+ private List createTime;
+
+ @Schema(description = "函数名称")
+ private String functionName;
+
+ @Schema(description = "AI供应商")
+ private String aiProvider;
+
+ @Schema(description = "AI模型")
+ private String aiModel;
+}
diff --git a/src/main/java/com/youlai/boot/platform/ai/service/AiAssistantRecordService.java b/src/main/java/com/youlai/boot/platform/ai/service/AiAssistantRecordService.java
index 03861aee..e542025c 100644
--- a/src/main/java/com/youlai/boot/platform/ai/service/AiAssistantRecordService.java
+++ b/src/main/java/com/youlai/boot/platform/ai/service/AiAssistantRecordService.java
@@ -6,7 +6,7 @@ import com.youlai.boot.platform.ai.model.dto.AiExecuteRequestDTO;
import com.youlai.boot.platform.ai.model.dto.AiParseRequestDTO;
import com.youlai.boot.platform.ai.model.dto.AiParseResponseDTO;
import com.youlai.boot.platform.ai.model.entity.AiAssistantRecord;
-import com.youlai.boot.platform.ai.model.query.AiAssistantPageQuery;
+import com.youlai.boot.platform.ai.model.query.AiAssistantQuery;
import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVO;
import jakarta.servlet.http.HttpServletRequest;
@@ -47,7 +47,7 @@ public interface AiAssistantRecordService extends IService {
* @param queryParams 查询参数
* @return 分页列表
*/
- IPage getRecordPage(AiAssistantPageQuery queryParams);
+ IPage getRecordPage(AiAssistantQuery queryParams);
/**
* 删除 AI 助手行为记录。
diff --git a/src/main/java/com/youlai/boot/platform/ai/service/impl/AiAssistantRecordServiceImpl.java b/src/main/java/com/youlai/boot/platform/ai/service/impl/AiAssistantRecordServiceImpl.java
index 3835916b..66b0a690 100644
--- a/src/main/java/com/youlai/boot/platform/ai/service/impl/AiAssistantRecordServiceImpl.java
+++ b/src/main/java/com/youlai/boot/platform/ai/service/impl/AiAssistantRecordServiceImpl.java
@@ -15,7 +15,7 @@ import com.youlai.boot.platform.ai.model.dto.AiFunctionCallDTO;
import com.youlai.boot.platform.ai.model.dto.AiParseRequestDTO;
import com.youlai.boot.platform.ai.model.dto.AiParseResponseDTO;
import com.youlai.boot.platform.ai.model.entity.AiAssistantRecord;
-import com.youlai.boot.platform.ai.model.query.AiAssistantPageQuery;
+import com.youlai.boot.platform.ai.model.query.AiAssistantQuery;
import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVO;
import com.youlai.boot.platform.ai.service.AiAssistantRecordService;
import com.youlai.boot.platform.ai.tools.UserTools;
@@ -294,13 +294,16 @@ public class AiAssistantRecordServiceImpl
}
@Override
- public IPage getRecordPage(AiAssistantPageQuery queryParams) {
+ public IPage getRecordPage(AiAssistantQuery queryParams) {
Page page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
return this.baseMapper.getRecordPage(page, queryParams);
}
@Override
public boolean deleteRecords(List ids) {
+ if (ids == null || ids.isEmpty()) {
+ return true;
+ }
return this.removeByIds(ids);
}
diff --git a/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java
index 5485dced..de890da4 100644
--- a/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java
+++ b/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java
@@ -7,7 +7,7 @@ import com.youlai.boot.config.property.CodegenProperties;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.platform.codegen.service.CodegenService;
import com.youlai.boot.platform.codegen.model.form.GenConfigForm;
-import com.youlai.boot.platform.codegen.model.query.TablePageQuery;
+import com.youlai.boot.platform.codegen.model.query.TableQuery;
import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO;
import com.youlai.boot.platform.codegen.model.vo.TablePageVO;
import com.youlai.boot.common.annotation.Log;
@@ -44,10 +44,10 @@ public class CodegenController {
private final CodegenProperties codegenProperties;
@Operation(summary = "获取数据表分页列表")
- @GetMapping("/table/page")
+ @GetMapping("/table")
@Log(value = "代码生成分页列表", module = LogModuleEnum.OTHER)
public PageResult getTablePage(
- TablePageQuery queryParams
+ TableQuery queryParams
) {
Page result = codegenService.getTablePage(queryParams);
return PageResult.success(result);
diff --git a/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java
index 3d742c63..c62c79c2 100644
--- a/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java
+++ b/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.platform.codegen.model.bo.ColumnMetaData;
import com.youlai.boot.platform.codegen.model.bo.TableMetaData;
-import com.youlai.boot.platform.codegen.model.query.TablePageQuery;
+import com.youlai.boot.platform.codegen.model.query.TableQuery;
import com.youlai.boot.platform.codegen.model.vo.TablePageVO;
import org.apache.ibatis.annotations.Mapper;
@@ -27,7 +27,7 @@ public interface DatabaseMapper extends BaseMapper {
* @param queryParams
* @return
*/
- Page getTablePage(Page page, TablePageQuery queryParams);
+ Page getTablePage(Page page, TableQuery queryParams);
/**
* 获取表字段列表
diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java b/src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java
index 4213560d..b9895385 100644
--- a/src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java
+++ b/src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java
@@ -1,7 +1,7 @@
package com.youlai.boot.platform.codegen.model.query;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -17,7 +17,7 @@ import java.util.List;
@Schema(description = "数据表分页查询对象")
@Getter
@Setter
-public class TablePageQuery extends BasePageQuery {
+public class TablePageQuery extends BaseQuery {
@Schema(description="关键字(表名)")
private String keywords;
diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/query/TableQuery.java b/src/main/java/com/youlai/boot/platform/codegen/model/query/TableQuery.java
new file mode 100644
index 00000000..443efab6
--- /dev/null
+++ b/src/main/java/com/youlai/boot/platform/codegen/model/query/TableQuery.java
@@ -0,0 +1,31 @@
+package com.youlai.boot.platform.codegen.model.query;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.youlai.boot.common.base.BaseQuery;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 数据表查询对象
+ *
+ * @author Ray
+ * @since 2.10.0
+ */
+@Schema(description = "数据表查询对象")
+@Getter
+@Setter
+public class TableQuery extends BaseQuery {
+
+ @Schema(description="关键字(表名)")
+ private String keywords;
+
+ /**
+ * 排除的表名
+ */
+ @JsonIgnore
+ private List excludeTables;
+
+}
diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java b/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java
index 32c020d1..aa1f4a58 100644
--- a/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java
+++ b/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java
@@ -1,7 +1,7 @@
package com.youlai.boot.platform.codegen.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.platform.codegen.model.query.TablePageQuery;
+import com.youlai.boot.platform.codegen.model.query.TableQuery;
import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO;
import com.youlai.boot.platform.codegen.model.vo.TablePageVO;
@@ -21,7 +21,7 @@ public interface CodegenService {
* @param queryParams 查询参数
* @return
*/
- Page getTablePage(TablePageQuery queryParams);
+ Page getTablePage(TableQuery queryParams);
/**
* 获取预览生成代码
diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java
index 8722ec86..20309ff5 100644
--- a/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java
+++ b/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java
@@ -20,7 +20,7 @@ import com.youlai.boot.core.exception.BusinessException;
import com.youlai.boot.platform.codegen.mapper.DatabaseMapper;
import com.youlai.boot.platform.codegen.model.entity.GenTable;
import com.youlai.boot.platform.codegen.model.entity.GenTableColumn;
-import com.youlai.boot.platform.codegen.model.query.TablePageQuery;
+import com.youlai.boot.platform.codegen.model.query.TableQuery;
import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO;
import com.youlai.boot.platform.codegen.model.vo.TablePageVO;
import lombok.RequiredArgsConstructor;
@@ -61,7 +61,7 @@ public class CodegenServiceImpl implements CodegenService {
* @param queryParams 查询参数
* @return 分页结果
*/
- public Page getTablePage(TablePageQuery queryParams) {
+ public Page getTablePage(TableQuery queryParams) {
Page page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
// 设置排除的表
List excludeTables = codegenProperties.getExcludeTables();
diff --git a/src/main/java/com/youlai/boot/system/controller/ConfigController.java b/src/main/java/com/youlai/boot/system/controller/ConfigController.java
index a7df99ed..280a4e32 100644
--- a/src/main/java/com/youlai/boot/system/controller/ConfigController.java
+++ b/src/main/java/com/youlai/boot/system/controller/ConfigController.java
@@ -6,7 +6,7 @@ import com.youlai.boot.core.web.PageResult;
import com.youlai.boot.core.web.Result;
import com.youlai.boot.common.annotation.Log;
import com.youlai.boot.system.model.form.ConfigForm;
-import com.youlai.boot.system.model.query.ConfigPageQuery;
+import com.youlai.boot.system.model.query.ConfigQuery;
import com.youlai.boot.system.model.vo.ConfigVO;
import com.youlai.boot.system.service.ConfigService;
import io.swagger.v3.oas.annotations.Parameter;
@@ -35,11 +35,11 @@ public class ConfigController {
private final ConfigService configService;
@Operation(summary = "系统配置分页列表")
- @GetMapping("/page")
+ @GetMapping
@PreAuthorize("@ss.hasPerm('sys:config:list')")
@Log( value = "系统配置分页列表",module = LogModuleEnum.SETTING)
- public PageResult page(@ParameterObject ConfigPageQuery configPageQuery) {
- IPage result = configService.page(configPageQuery);
+ public PageResult page(@ParameterObject ConfigQuery queryParams) {
+ IPage result = configService.page(queryParams);
return PageResult.success(result);
}
diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java
index ea0d2881..28f0b1aa 100644
--- a/src/main/java/com/youlai/boot/system/controller/DictController.java
+++ b/src/main/java/com/youlai/boot/system/controller/DictController.java
@@ -6,8 +6,8 @@ import com.youlai.boot.core.web.PageResult;
import com.youlai.boot.core.web.Result;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.system.model.form.DictItemForm;
-import com.youlai.boot.system.model.query.DictItemPageQuery;
-import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.query.DictItemQuery;
+import com.youlai.boot.system.model.query.DictQuery;
import com.youlai.boot.system.model.vo.DictItemOptionVO;
import com.youlai.boot.system.model.vo.DictItemPageVO;
import com.youlai.boot.system.model.vo.DictPageVO;
@@ -48,10 +48,10 @@ public class DictController {
// 字典相关接口
//---------------------------------------------------
@Operation(summary = "字典分页列表")
- @GetMapping("/page")
+ @GetMapping
@Log( value = "字典分页列表",module = LogModuleEnum.DICT)
public PageResult getDictPage(
- DictPageQuery queryParams
+ DictQuery queryParams
) {
Page result = dictService.getDictPage(queryParams);
return PageResult.success(result);
@@ -59,7 +59,7 @@ public class DictController {
@Operation(summary = "字典列表")
- @GetMapping
+ @GetMapping("/options")
public Result>> getDictList() {
List> list = dictService.getDictList();
return Result.success(list);
@@ -126,10 +126,10 @@ public class DictController {
// 字典项相关接口
//---------------------------------------------------
@Operation(summary = "字典项分页列表")
- @GetMapping("/{dictCode}/items/page")
+ @GetMapping("/{dictCode}/items")
public PageResult getDictItemPage(
@PathVariable String dictCode,
- DictItemPageQuery queryParams
+ DictItemQuery queryParams
) {
queryParams.setDictCode(dictCode);
Page result = dictItemService.getDictItemPage(queryParams);
@@ -137,7 +137,7 @@ public class DictController {
}
@Operation(summary = "字典项列表")
- @GetMapping("/{dictCode}/items")
+ @GetMapping("/{dictCode}/items/options")
public Result> getDictItems(
@Parameter(description = "字典编码") @PathVariable String dictCode
) {
diff --git a/src/main/java/com/youlai/boot/system/controller/LogController.java b/src/main/java/com/youlai/boot/system/controller/LogController.java
index 48e754ab..89d0a85c 100644
--- a/src/main/java/com/youlai/boot/system/controller/LogController.java
+++ b/src/main/java/com/youlai/boot/system/controller/LogController.java
@@ -2,7 +2,7 @@ package com.youlai.boot.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.core.web.PageResult;
-import com.youlai.boot.system.model.query.LogPageQuery;
+import com.youlai.boot.system.model.query.LogQuery;
import com.youlai.boot.system.model.vo.LogPageVO;
import com.youlai.boot.system.service.LogService;
import io.swagger.v3.oas.annotations.Operation;
@@ -25,9 +25,9 @@ public class LogController {
private final LogService logService;
@Operation(summary = "日志分页列表")
- @GetMapping("/page")
+ @GetMapping
public PageResult getLogPage(
- LogPageQuery queryParams
+ LogQuery queryParams
) {
Page result = logService.getLogPage(queryParams);
return PageResult.success(result);
diff --git a/src/main/java/com/youlai/boot/system/controller/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java
index 02979681..e2700d85 100644
--- a/src/main/java/com/youlai/boot/system/controller/NoticeController.java
+++ b/src/main/java/com/youlai/boot/system/controller/NoticeController.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.youlai.boot.core.web.PageResult;
import com.youlai.boot.core.web.Result;
import com.youlai.boot.system.model.form.NoticeForm;
-import com.youlai.boot.system.model.query.NoticePageQuery;
+import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.NoticeDetailVO;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
@@ -36,9 +36,9 @@ public class NoticeController {
private final UserNoticeService userNoticeService;
@Operation(summary = "通知公告分页列表")
- @GetMapping("/page")
+ @GetMapping
@PreAuthorize("@ss.hasPerm('sys:notice:list')")
- public PageResult getNoticePage(NoticePageQuery queryParams) {
+ public PageResult getNoticePage(NoticeQuery queryParams) {
IPage result = noticeService.getNoticePage(queryParams);
return PageResult.success(result);
}
@@ -121,7 +121,7 @@ public class NoticeController {
@Operation(summary = "获取我的通知公告分页列表")
@GetMapping("/my")
public PageResult getMyNoticePage(
- NoticePageQuery queryParams
+ NoticeQuery queryParams
) {
IPage result = noticeService.getMyNoticePage(queryParams);
return PageResult.success(result);
diff --git a/src/main/java/com/youlai/boot/system/controller/RoleController.java b/src/main/java/com/youlai/boot/system/controller/RoleController.java
index e178518d..b442ad63 100644
--- a/src/main/java/com/youlai/boot/system/controller/RoleController.java
+++ b/src/main/java/com/youlai/boot/system/controller/RoleController.java
@@ -7,7 +7,7 @@ import com.youlai.boot.common.model.Option;
import com.youlai.boot.core.web.PageResult;
import com.youlai.boot.core.web.Result;
import com.youlai.boot.system.model.form.RoleForm;
-import com.youlai.boot.system.model.query.RolePageQuery;
+import com.youlai.boot.system.model.query.RoleQuery;
import com.youlai.boot.system.model.vo.RolePageVO;
import com.youlai.boot.common.annotation.Log;
import com.youlai.boot.system.service.RoleService;
@@ -37,10 +37,10 @@ public class RoleController {
private final RoleService roleService;
@Operation(summary = "角色分页列表")
- @GetMapping("/page")
+ @GetMapping
@Log(value = "角色分页列表", module = LogModuleEnum.ROLE)
public PageResult getRolePage(
- RolePageQuery queryParams
+ RoleQuery queryParams
) {
Page result = roleService.getRolePage(queryParams);
return PageResult.success(result);
diff --git a/src/main/java/com/youlai/boot/system/controller/StatisticsController.java b/src/main/java/com/youlai/boot/system/controller/StatisticsController.java
index 50184c5b..7cc9d109 100644
--- a/src/main/java/com/youlai/boot/system/controller/StatisticsController.java
+++ b/src/main/java/com/youlai/boot/system/controller/StatisticsController.java
@@ -20,7 +20,7 @@ import java.time.LocalDate;
*/
@Tag(name = "11.统计分析")
@RestController
-@RequestMapping("/api/v1/statistics")
+@RequestMapping("/statistics")
@RequiredArgsConstructor
public class StatisticsController {
diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java
index 5cfbe33c..8705986c 100644
--- a/src/main/java/com/youlai/boot/system/controller/UserController.java
+++ b/src/main/java/com/youlai/boot/system/controller/UserController.java
@@ -3,7 +3,6 @@ package com.youlai.boot.system.controller;
import cn.idev.excel.EasyExcel;
import cn.idev.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.youlai.boot.common.annotation.Log;
import com.youlai.boot.common.annotation.RepeatSubmit;
import com.youlai.boot.common.enums.LogModuleEnum;
@@ -18,7 +17,7 @@ import com.youlai.boot.system.model.dto.UserExportDTO;
import com.youlai.boot.system.model.dto.UserImportDTO;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.form.*;
-import com.youlai.boot.system.model.query.UserPageQuery;
+import com.youlai.boot.system.model.query.UserQuery;
import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
@@ -56,14 +55,13 @@ public class UserController {
private final UserService userService;
- @Operation(summary = "用户分页列表")
- @GetMapping("/page")
- @Log(value = "用户分页列表", module = LogModuleEnum.USER)
- public PageResult getUserPage(
- @Valid UserPageQuery queryParams
+ @Operation(summary = "用户列表")
+ @GetMapping
+ @Log(value = "用户列表", module = LogModuleEnum.USER)
+ public PageResult getUserList(
+ @Valid UserQuery queryParams
) {
- IPage result = userService.getUserPage(queryParams);
- return PageResult.success(result);
+ return PageResult.success(userService.getUserPage(queryParams));
}
@Operation(summary = "新增用户")
@@ -168,7 +166,7 @@ public class UserController {
@GetMapping("/export")
@PreAuthorize("@ss.hasPerm('sys:user:export')")
@Log(value = "导出用户", module = LogModuleEnum.USER)
- public void exportUsers(UserPageQuery queryParams, HttpServletResponse response) throws IOException {
+ public void exportUsers(UserQuery queryParams, HttpServletResponse response) throws IOException {
String fileName = "用户列表.xlsx";
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8));
diff --git a/src/main/java/com/youlai/boot/system/converter/UserConverter.java b/src/main/java/com/youlai/boot/system/converter/UserConverter.java
index 128d4773..eb63ce58 100644
--- a/src/main/java/com/youlai/boot/system/converter/UserConverter.java
+++ b/src/main/java/com/youlai/boot/system/converter/UserConverter.java
@@ -30,6 +30,8 @@ public interface UserConverter {
Page toPageVo(Page bo);
+ List toPageVo(List bo);
+
UserForm toForm(User entity);
@InheritInverseConfiguration(name = "toForm")
diff --git a/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
index 1a0e1426..64bb7af5 100644
--- a/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
@@ -3,7 +3,7 @@ package com.youlai.boot.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.DictItem;
-import com.youlai.boot.system.model.query.DictItemPageQuery;
+import com.youlai.boot.system.model.query.DictItemQuery;
import com.youlai.boot.system.model.vo.DictItemPageVO;
import org.apache.ibatis.annotations.Mapper;
@@ -19,7 +19,7 @@ public interface DictItemMapper extends BaseMapper {
/**
* 字典项分页列表
*/
- Page getDictItemPage(Page page, DictItemPageQuery queryParams);
+ Page getDictItemPage(Page page, DictItemQuery queryParams);
}
diff --git a/src/main/java/com/youlai/boot/system/mapper/DictMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java
index a40fbb29..c18b5d06 100644
--- a/src/main/java/com/youlai/boot/system/mapper/DictMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java
@@ -3,7 +3,7 @@ package com.youlai.boot.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.Dict;
-import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.query.DictQuery;
import com.youlai.boot.system.model.vo.DictPageVO;
import org.apache.ibatis.annotations.Mapper;
@@ -23,7 +23,7 @@ public interface DictMapper extends BaseMapper {
* @param queryParams 查询参数
* @return 字典分页列表
*/
- Page getDictPage(Page page, DictPageQuery queryParams);
+ Page getDictPage(Page page, DictQuery queryParams);
}
diff --git a/src/main/java/com/youlai/boot/system/mapper/LogMapper.java b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java
index 1ff3dead..a11c5b65 100644
--- a/src/main/java/com/youlai/boot/system/mapper/LogMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.bo.VisitCountBO;
import com.youlai.boot.system.model.bo.VisitStatsBO;
import com.youlai.boot.system.model.entity.Log;
-import com.youlai.boot.system.model.query.LogPageQuery;
+import com.youlai.boot.system.model.query.LogQuery;
import com.youlai.boot.system.model.vo.LogPageVO;
import org.apache.ibatis.annotations.Mapper;
@@ -24,7 +24,7 @@ public interface LogMapper extends BaseMapper {
/**
* 获取日志分页列表
*/
- Page getLogPage(Page page, LogPageQuery queryParams);
+ Page getLogPage(Page page, LogQuery queryParams);
/**
* 统计浏览数(PV)
diff --git a/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java b/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java
index 74ad716d..deecc006 100644
--- a/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.bo.NoticeBO;
import com.youlai.boot.system.model.entity.Notice;
-import com.youlai.boot.system.model.query.NoticePageQuery;
+import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.NoticePageVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -25,7 +25,7 @@ public interface NoticeMapper extends BaseMapper {
* @param queryParams 查询参数
* @return 通知公告分页数据
*/
- Page getNoticePage(Page page, NoticePageQuery queryParams);
+ Page getNoticePage(Page page, NoticeQuery queryParams);
/**
* 获取阅读时通知公告详情
diff --git a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java
index 9b9ec6b5..df098363 100644
--- a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java
@@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.bo.UserBO;
import com.youlai.boot.system.model.entity.User;
-import com.youlai.boot.system.model.query.UserPageQuery;
+import com.youlai.boot.system.model.query.UserQuery;
import com.youlai.boot.system.model.form.UserForm;
import com.youlai.boot.common.annotation.DataPermission;
import com.youlai.boot.security.model.UserAuthInfo;
import com.youlai.boot.system.model.dto.UserExportDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -30,7 +31,7 @@ public interface UserMapper extends BaseMapper {
* @return 用户分页列表
*/
@DataPermission(deptAlias = "u", userAlias = "u")
- Page getUserPage(Page page, UserPageQuery queryParams);
+ Page getUserPage(Page page, @Param("queryParams") UserQuery queryParams);
/**
* 获取用户表单详情
@@ -83,7 +84,7 @@ public interface UserMapper extends BaseMapper {
* @return 导出用户列表
*/
@DataPermission(deptAlias = "u", userAlias = "u")
- List listExportUsers(UserPageQuery queryParams);
+ List listExportUsers(UserQuery queryParams);
/**
* 获取用户个人中心信息
diff --git a/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java
index 78f0e7ef..378f0606 100644
--- a/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.UserNotice;
-import com.youlai.boot.system.model.query.NoticePageQuery;
+import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import org.apache.ibatis.annotations.Mapper;
@@ -25,5 +25,5 @@ public interface UserNoticeMapper extends BaseMapper {
* @param queryParams 查询参数
* @return 通知公告分页列表
*/
- IPage getMyNoticePage(Page page, @Param("queryParams") NoticePageQuery queryParams);
+ IPage getMyNoticePage(Page page, @Param("queryParams") NoticeQuery queryParams);
}
diff --git a/src/main/java/com/youlai/boot/system/model/query/ConfigPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/ConfigQuery.java
similarity index 68%
rename from src/main/java/com/youlai/boot/system/model/query/ConfigPageQuery.java
rename to src/main/java/com/youlai/boot/system/model/query/ConfigQuery.java
index 3105c2a9..88ce9d85 100644
--- a/src/main/java/com/youlai/boot/system/model/query/ConfigPageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/ConfigQuery.java
@@ -1,6 +1,6 @@
package com.youlai.boot.system.model.query;
-import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -13,8 +13,8 @@ import lombok.Setter;
*/
@Getter
@Setter
-@Schema(description = "系统配置分页查询")
-public class ConfigPageQuery extends BasePageQuery {
+@Schema(description = "系统配置查询")
+public class ConfigQuery extends BaseQuery {
@Schema(description="关键字(配置项名称/配置项值)")
private String keywords;
diff --git a/src/main/java/com/youlai/boot/system/model/query/DictItemPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/DictItemQuery.java
similarity index 69%
rename from src/main/java/com/youlai/boot/system/model/query/DictItemPageQuery.java
rename to src/main/java/com/youlai/boot/system/model/query/DictItemQuery.java
index 24adabf1..f7d1ff6c 100644
--- a/src/main/java/com/youlai/boot/system/model/query/DictItemPageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/DictItemQuery.java
@@ -1,15 +1,14 @@
package com.youlai.boot.system.model.query;
-
-import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
-@Schema(description ="字典项分页查询对象")
-public class DictItemPageQuery extends BasePageQuery {
+@Schema(description ="字典项查询对象")
+public class DictItemQuery extends BaseQuery {
@Schema(description="关键字(字典项值/字典项名称)")
private String keywords;
diff --git a/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/DictQuery.java
similarity index 64%
rename from src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java
rename to src/main/java/com/youlai/boot/system/model/query/DictQuery.java
index a9bbe4ee..184065fd 100644
--- a/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/DictQuery.java
@@ -1,14 +1,14 @@
package com.youlai.boot.system.model.query;
-import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
-@Schema(description ="字典分页查询对象")
-public class DictPageQuery extends BasePageQuery {
+@Schema(description ="字典查询对象")
+public class DictQuery extends BaseQuery {
@Schema(description="关键字(字典名称)")
private String keywords;
diff --git a/src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/LogQuery.java
similarity index 71%
rename from src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java
rename to src/main/java/com/youlai/boot/system/model/query/LogQuery.java
index 1de60a20..f3d84c39 100644
--- a/src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/LogQuery.java
@@ -1,21 +1,22 @@
package com.youlai.boot.system.model.query;
-import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
+
import java.util.List;
/**
- * 日志分页查询对象
+ * 日志查询对象
*
* @author Ray
* @since 2.10.0
*/
-@Schema(description = "日志分页查询对象")
+@Schema(description = "日志查询对象")
@Getter
@Setter
-public class LogPageQuery extends BasePageQuery {
+public class LogQuery extends BaseQuery {
@Schema(description="关键字(日志内容/请求路径/请求方法/地区/浏览器/终端系统)")
private String keywords;
diff --git a/src/main/java/com/youlai/boot/system/model/query/NoticePageQuery.java b/src/main/java/com/youlai/boot/system/model/query/NoticeQuery.java
similarity index 84%
rename from src/main/java/com/youlai/boot/system/model/query/NoticePageQuery.java
rename to src/main/java/com/youlai/boot/system/model/query/NoticeQuery.java
index 63061208..55154a49 100644
--- a/src/main/java/com/youlai/boot/system/model/query/NoticePageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/NoticeQuery.java
@@ -1,6 +1,6 @@
package com.youlai.boot.system.model.query;
-import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
import java.util.List;
/**
- * 通知公告分页查询对象
+ * 通知公告查询对象
*
* @author youlaitech
* @since 2024-08-27 10:31
@@ -16,7 +16,7 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description ="通知公告查询对象")
-public class NoticePageQuery extends BasePageQuery {
+public class NoticeQuery extends BaseQuery {
@Schema(description = "通知标题")
private String title;
diff --git a/src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java b/src/main/java/com/youlai/boot/system/model/query/RoleQuery.java
similarity index 77%
rename from src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java
rename to src/main/java/com/youlai/boot/system/model/query/RoleQuery.java
index 4fc7cd3d..f69e4afe 100644
--- a/src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/RoleQuery.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.model.query;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -9,15 +9,15 @@ import lombok.Setter;
import java.time.LocalDateTime;
/**
- * 角色分页查询对象
+ * 角色查询对象
*
* @author Ray
* @since 2022/6/3
*/
-@Schema(description = "角色分页查询对象")
+@Schema(description = "角色查询对象")
@Getter
@Setter
-public class RolePageQuery extends BasePageQuery {
+public class RoleQuery extends BaseQuery {
@Schema(description="关键字(角色名称/角色编码)")
private String keywords;
diff --git a/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/UserQuery.java
similarity index 54%
rename from src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java
rename to src/main/java/com/youlai/boot/system/model/query/UserQuery.java
index a2b2fbff..43bdeed0 100644
--- a/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/UserQuery.java
@@ -1,25 +1,17 @@
package com.youlai.boot.system.model.query;
-import cn.hutool.db.sql.Direction;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.youlai.boot.common.base.BasePageQuery;
-import com.youlai.boot.common.annotation.ValidField;
+import com.youlai.boot.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
-/**
- * 用户分页查询对象
- *
- * @author haoxr
- * @since 2022/1/14
- */
@Data
@EqualsAndHashCode(callSuper = false)
-@Schema(description = "用户分页查询对象")
-public class UserPageQuery extends BasePageQuery {
+@Schema(description = "用户查询对象")
+public class UserQuery extends BaseQuery {
@Schema(description = "关键字(用户名/昵称/手机号)")
private String keywords;
@@ -36,18 +28,7 @@ public class UserPageQuery extends BasePageQuery {
@Schema(description = "创建时间范围")
private List createTime;
- @Schema(description = "排序的字段")
- @ValidField(allowedValues = {"create_time", "update_time"})
- private String field;
-
- @Schema(description = "排序方式（正序:ASC；反序:DESC）")
- private Direction direction;
-
- /**
- * 是否超级管理员
- */
@JsonIgnore
@Schema(hidden = true)
private Boolean isRoot;
-
}
diff --git a/src/main/java/com/youlai/boot/system/service/ConfigService.java b/src/main/java/com/youlai/boot/system/service/ConfigService.java
index 988db94d..d663826f 100644
--- a/src/main/java/com/youlai/boot/system/service/ConfigService.java
+++ b/src/main/java/com/youlai/boot/system/service/ConfigService.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.entity.Config;
import com.youlai.boot.system.model.form.ConfigForm;
-import com.youlai.boot.system.model.query.ConfigPageQuery;
+import com.youlai.boot.system.model.query.ConfigQuery;
import com.youlai.boot.system.model.vo.ConfigVO;
/**
@@ -20,7 +20,7 @@ public interface ConfigService extends IService {
* @param sysConfigPageQuery 查询参数
* @return 系统配置分页列表
*/
- IPage page(ConfigPageQuery sysConfigPageQuery);
+ IPage page(ConfigQuery sysConfigPageQuery);
/**
* 保存系统配置
diff --git a/src/main/java/com/youlai/boot/system/service/DictItemService.java b/src/main/java/com/youlai/boot/system/service/DictItemService.java
index 54d4d197..d7a64ef0 100644
--- a/src/main/java/com/youlai/boot/system/service/DictItemService.java
+++ b/src/main/java/com/youlai/boot/system/service/DictItemService.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.form.DictItemForm;
-import com.youlai.boot.system.model.query.DictItemPageQuery;
+import com.youlai.boot.system.model.query.DictItemQuery;
import com.youlai.boot.system.model.vo.DictItemOptionVO;
import com.youlai.boot.system.model.vo.DictItemPageVO;
@@ -24,7 +24,7 @@ public interface DictItemService extends IService {
* @param queryParams 查询参数
* @return 字典项分页列表
*/
- Page getDictItemPage(DictItemPageQuery queryParams);
+ Page getDictItemPage(DictItemQuery queryParams);
/**
* 获取字典项列表
diff --git a/src/main/java/com/youlai/boot/system/service/DictService.java b/src/main/java/com/youlai/boot/system/service/DictService.java
index 5ab06ab7..a064deda 100644
--- a/src/main/java/com/youlai/boot/system/service/DictService.java
+++ b/src/main/java/com/youlai/boot/system/service/DictService.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.entity.Dict;
import com.youlai.boot.system.model.form.DictForm;
-import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.query.DictQuery;
import com.youlai.boot.system.model.vo.DictItemOptionVO;
import com.youlai.boot.system.model.vo.DictPageVO;
@@ -25,7 +25,7 @@ public interface DictService extends IService {
* @param queryParams 分页查询对象
* @return 字典分页列表
*/
- Page getDictPage(DictPageQuery queryParams);
+ Page getDictPage(DictQuery queryParams);
/**
* 获取字典列表
diff --git a/src/main/java/com/youlai/boot/system/service/LogService.java b/src/main/java/com/youlai/boot/system/service/LogService.java
index 8a621e66..b3bab2fb 100644
--- a/src/main/java/com/youlai/boot/system/service/LogService.java
+++ b/src/main/java/com/youlai/boot/system/service/LogService.java
@@ -3,7 +3,7 @@ package com.youlai.boot.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.Log;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.system.model.query.LogPageQuery;
+import com.youlai.boot.system.model.query.LogQuery;
import com.youlai.boot.system.model.vo.LogPageVO;
import com.youlai.boot.system.model.vo.VisitStatsVO;
import com.youlai.boot.system.model.vo.VisitTrendVO;
@@ -22,7 +22,7 @@ public interface LogService extends IService {
/**
* 获取日志分页列表
*/
- Page getLogPage(LogPageQuery queryParams);
+ Page getLogPage(LogQuery queryParams);
/**
diff --git a/src/main/java/com/youlai/boot/system/service/NoticeService.java b/src/main/java/com/youlai/boot/system/service/NoticeService.java
index 870a3825..951366c7 100644
--- a/src/main/java/com/youlai/boot/system/service/NoticeService.java
+++ b/src/main/java/com/youlai/boot/system/service/NoticeService.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.entity.Notice;
import com.youlai.boot.system.model.form.NoticeForm;
-import com.youlai.boot.system.model.query.NoticePageQuery;
+import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import com.youlai.boot.system.model.vo.NoticeDetailVO;
@@ -22,7 +22,7 @@ public interface NoticeService extends IService {
*
* @return 通知公告分页列表
*/
- IPage getNoticePage(NoticePageQuery queryParams);
+ IPage getNoticePage(NoticeQuery queryParams);
/**
* 获取通知公告表单数据
@@ -87,5 +87,5 @@ public interface NoticeService extends IService {
* @param queryParams 查询参数
* @return 通知公告分页列表
*/
- IPage getMyNoticePage(NoticePageQuery queryParams);
+ IPage getMyNoticePage(NoticeQuery queryParams);
}
diff --git a/src/main/java/com/youlai/boot/system/service/RoleService.java b/src/main/java/com/youlai/boot/system/service/RoleService.java
index 43761877..d6f61562 100644
--- a/src/main/java/com/youlai/boot/system/service/RoleService.java
+++ b/src/main/java/com/youlai/boot/system/service/RoleService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.entity.Role;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.form.RoleForm;
-import com.youlai.boot.system.model.query.RolePageQuery;
+import com.youlai.boot.system.model.query.RoleQuery;
import com.youlai.boot.system.model.vo.RolePageVO;
import java.util.List;
@@ -26,7 +26,7 @@ public interface RoleService extends IService {
* @param queryParams
* @return
*/
- Page getRolePage(RolePageQuery queryParams);
+ Page getRolePage(RoleQuery queryParams);
/**
diff --git a/src/main/java/com/youlai/boot/system/service/UserNoticeService.java b/src/main/java/com/youlai/boot/system/service/UserNoticeService.java
index ddf31c11..4de8cdba 100644
--- a/src/main/java/com/youlai/boot/system/service/UserNoticeService.java
+++ b/src/main/java/com/youlai/boot/system/service/UserNoticeService.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.entity.UserNotice;
-import com.youlai.boot.system.model.query.NoticePageQuery;
+import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import com.youlai.boot.system.model.vo.NoticePageVO;
@@ -31,5 +31,5 @@ public interface UserNoticeService extends IService {
* @param queryParams 查询参数
* @return 我的通知公告分页列表
*/
- IPage getMyNoticePage(Page page, NoticePageQuery queryParams);
+ IPage getMyNoticePage(Page page, NoticeQuery queryParams);
}
diff --git a/src/main/java/com/youlai/boot/system/service/UserService.java b/src/main/java/com/youlai/boot/system/service/UserService.java
index 1fd8be81..b77da7ad 100644
--- a/src/main/java/com/youlai/boot/system/service/UserService.java
+++ b/src/main/java/com/youlai/boot/system/service/UserService.java
@@ -7,7 +7,7 @@ import com.youlai.boot.security.model.UserAuthInfo;
import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.dto.UserExportDTO;
import com.youlai.boot.system.model.entity.User;
-import com.youlai.boot.system.model.query.UserPageQuery;
+import com.youlai.boot.system.model.query.UserQuery;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
import com.youlai.boot.system.model.form.*;
@@ -27,7 +27,7 @@ public interface UserService extends IService {
*
* @return {@link IPage} 用户分页列表
*/
- IPage getUserPage(UserPageQuery queryParams);
+ IPage getUserPage(UserQuery queryParams);
/**
* 获取用户表单数据
@@ -84,7 +84,7 @@ public interface UserService extends IService {
* @param queryParams 查询参数
* @return {@link List} 导出用户列表
*/
- List listExportUsers(UserPageQuery queryParams);
+ List listExportUsers(UserQuery queryParams);
/**
diff --git a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
index e4e12c26..a0364b41 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
@@ -10,7 +10,7 @@ import com.youlai.boot.system.converter.ConfigConverter;
import com.youlai.boot.system.mapper.ConfigMapper;
import com.youlai.boot.system.model.entity.Config;
import com.youlai.boot.system.model.form.ConfigForm;
-import com.youlai.boot.system.model.query.ConfigPageQuery;
+import com.youlai.boot.system.model.query.ConfigQuery;
import com.youlai.boot.system.model.vo.ConfigVO;
import com.youlai.boot.system.service.ConfigService;
import com.youlai.boot.security.util.SecurityUtils;
@@ -50,13 +50,13 @@ public class ConfigServiceImpl extends ServiceImpl impleme
/**
* 分页查询系统配置
*
- * @param configPageQuery 查询参数
+ * @param queryParams 查询参数
* @return 系统配置分页列表
*/
@Override
- public IPage page(ConfigPageQuery configPageQuery) {
- Page page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize());
- String keywords = configPageQuery.getKeywords();
+ public IPage page(ConfigQuery queryParams) {
+ Page page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
+ String keywords = queryParams.getKeywords();
LambdaQueryWrapper query = new LambdaQueryWrapper()
.and(StringUtils.isNotBlank(keywords),
q -> q.like(Config::getConfigKey, keywords)
diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java
index 2804ac49..48c65a29 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java
@@ -7,7 +7,7 @@ import com.youlai.boot.system.converter.DictItemConverter;
import com.youlai.boot.system.mapper.DictItemMapper;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.form.DictItemForm;
-import com.youlai.boot.system.model.query.DictItemPageQuery;
+import com.youlai.boot.system.model.query.DictItemQuery;
import com.youlai.boot.system.model.vo.DictItemOptionVO;
import com.youlai.boot.system.model.vo.DictItemPageVO;
import com.youlai.boot.system.service.DictItemService;
@@ -36,7 +36,7 @@ public class DictItemServiceImpl extends ServiceImpl i
* @return 字典项分页列表
*/
@Override
- public Page getDictItemPage(DictItemPageQuery queryParams) {
+ public Page getDictItemPage(DictItemQuery queryParams) {
int pageNum = queryParams.getPageNum();
int pageSize = queryParams.getPageSize();
Page page = new Page<>(pageNum, pageSize);
diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
index 2573b4d3..eccf6c52 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
@@ -11,7 +11,7 @@ import com.youlai.boot.system.mapper.DictMapper;
import com.youlai.boot.system.model.entity.Dict;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.form.DictForm;
-import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.query.DictQuery;
import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.system.service.DictItemService;
import com.youlai.boot.system.service.DictService;
@@ -40,7 +40,7 @@ public class DictServiceImpl extends ServiceImpl implements Di
* @param queryParams 分页查询对象
*/
@Override
- public Page getDictPage(DictPageQuery queryParams) {
+ public Page getDictPage(DictQuery queryParams) {
// 查询参数
int pageNum = queryParams.getPageNum();
int pageSize = queryParams.getPageSize();
diff --git a/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java
index b1f505e6..92454d2b 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java
@@ -6,7 +6,7 @@ import com.youlai.boot.system.mapper.LogMapper;
import com.youlai.boot.system.model.bo.VisitCountBO;
import com.youlai.boot.system.model.bo.VisitStatsBO;
import com.youlai.boot.system.model.entity.Log;
-import com.youlai.boot.system.model.query.LogPageQuery;
+import com.youlai.boot.system.model.query.LogQuery;
import com.youlai.boot.system.model.vo.LogPageVO;
import com.youlai.boot.system.model.vo.VisitStatsVO;
import com.youlai.boot.system.model.vo.VisitTrendVO;
@@ -36,7 +36,7 @@ public class LogServiceImpl extends ServiceImpl
* @return 日志分页列表
*/
@Override
- public Page getLogPage(LogPageQuery queryParams) {
+ public Page getLogPage(LogQuery queryParams) {
return this.baseMapper.getLogPage(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
queryParams);
}
diff --git a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
index c1d35308..1b16f11f 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
@@ -19,7 +19,7 @@ import com.youlai.boot.system.model.entity.Notice;
import com.youlai.boot.system.model.entity.UserNotice;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.form.NoticeForm;
-import com.youlai.boot.system.model.query.NoticePageQuery;
+import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import com.youlai.boot.system.model.vo.NoticeDetailVO;
@@ -63,7 +63,7 @@ public class NoticeServiceImpl extends ServiceImpl impleme
* @return {@link IPage< NoticePageVo >} 通知公告分页列表
*/
@Override
- public IPage getNoticePage(NoticePageQuery queryParams) {
+ public IPage getNoticePage(NoticeQuery queryParams) {
Page noticePage = this.baseMapper.getNoticePage(
new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
queryParams
@@ -291,8 +291,11 @@ public class NoticeServiceImpl extends ServiceImpl impleme
* @return 通知公告分页列表
*/
@Override
- public IPage getMyNoticePage(NoticePageQuery queryParams) {
- queryParams.setUserId(SecurityUtils.getUserId());
+ public IPage getMyNoticePage(
+ NoticeQuery queryParams
+ ) {
+ Long userId = SecurityUtils.getUserId();
+ queryParams.setUserId(userId);
return userNoticeService.getMyNoticePage(
new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
queryParams
diff --git a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java
index 7abc16d9..787a1f0c 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java
@@ -13,7 +13,7 @@ import com.youlai.boot.system.mapper.RoleMapper;
import com.youlai.boot.system.model.entity.Role;
import com.youlai.boot.system.model.entity.RoleMenu;
import com.youlai.boot.system.model.form.RoleForm;
-import com.youlai.boot.system.model.query.RolePageQuery;
+import com.youlai.boot.system.model.query.RoleQuery;
import com.youlai.boot.system.model.vo.RolePageVO;
import com.youlai.boot.common.constant.SystemConstants;
import com.youlai.boot.common.model.Option;
@@ -51,7 +51,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro
* @return {@link Page< RolePageVo >} – 角色分页列表
*/
@Override
- public Page getRolePage(RolePageQuery queryParams) {
+ public Page getRolePage(RoleQuery queryParams) {
// 查询参数
int pageNum = queryParams.getPageNum();
int pageSize = queryParams.getPageSize();
diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java
index aa82529c..74b66d82 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.boot.security.util.SecurityUtils;
import com.youlai.boot.system.mapper.UserNoticeMapper;
import com.youlai.boot.system.model.entity.UserNotice;
-import com.youlai.boot.system.model.query.NoticePageQuery;
+import com.youlai.boot.system.model.query.NoticeQuery;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import com.youlai.boot.system.service.UserNoticeService;
@@ -51,7 +51,7 @@ public class UserNoticeServiceImpl extends ServiceImpl getMyNoticePage(Page page, NoticePageQuery queryParams) {
+ public IPage getMyNoticePage(Page page, NoticeQuery queryParams) {
return this.getBaseMapper().getMyNoticePage(
new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
queryParams
diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
index 105362c1..65a6cac0 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
@@ -12,13 +12,13 @@ import com.youlai.boot.common.constant.RedisConstants;
import com.youlai.boot.common.constant.SystemConstants;
import com.youlai.boot.core.exception.BusinessException;
import com.youlai.boot.common.model.Option;
+import com.youlai.boot.platform.mail.service.MailService;
import com.youlai.boot.platform.sms.enums.SmsTypeEnum;
import com.youlai.boot.platform.sms.service.SmsService;
import com.youlai.boot.security.model.UserAuthInfo;
import com.youlai.boot.security.service.PermissionService;
import com.youlai.boot.security.token.TokenManager;
import com.youlai.boot.security.util.SecurityUtils;
-import com.youlai.boot.platform.mail.service.MailService;
import com.youlai.boot.system.converter.UserConverter;
import com.youlai.boot.system.enums.DictCodeEnum;
import com.youlai.boot.system.mapper.UserMapper;
@@ -29,7 +29,7 @@ import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.entity.UserRole;
import com.youlai.boot.system.model.form.*;
-import com.youlai.boot.system.model.query.UserPageQuery;
+import com.youlai.boot.system.model.query.UserQuery;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
import com.youlai.boot.system.service.*;
@@ -84,7 +84,7 @@ public class UserServiceImpl extends ServiceImpl implements Us
* @return {@link IPage} 用户分页列表
*/
@Override
- public IPage getUserPage(UserPageQuery queryParams) {
+ public IPage getUserPage(UserQuery queryParams) {
// 参数构建
int pageNum = queryParams.getPageNum();
@@ -403,7 +403,7 @@ public class UserServiceImpl extends ServiceImpl implements Us
* @return {@link List} 导出用户列表
*/
@Override
- public List listExportUsers(UserPageQuery queryParams) {
+ public List listExportUsers(UserQuery queryParams) {
boolean isRoot = SecurityUtils.isRoot();
queryParams.setIsRoot(isRoot);
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 2f8332d2..47806b17 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,5 +1,5 @@
server:
- port: 8989
+ port: 8000
spring:
datasource:
@@ -318,4 +318,3 @@ ai:
rate-limit:
max-executions-per-minute: 10
max-executions-per-day: 100
-
diff --git a/src/main/resources/mapper/codegen/DatabaseMapper.xml b/src/main/resources/mapper/codegen/DatabaseMapper.xml
index 0e402a8d..b7a8b34f 100644
--- a/src/main/resources/mapper/codegen/DatabaseMapper.xml
+++ b/src/main/resources/mapper/codegen/DatabaseMapper.xml
@@ -33,35 +33,6 @@
ORDER BY
CREATE_TIME DESC
-
-
-
-
-
-
diff --git a/src/main/resources/mapper/system/LogMapper.xml b/src/main/resources/mapper/system/LogMapper.xml
index 3099ba0d..cc00db1a 100644
--- a/src/main/resources/mapper/system/LogMapper.xml
+++ b/src/main/resources/mapper/system/LogMapper.xml
@@ -23,7 +23,6 @@
sys_log t1
LEFT JOIN sys_user t2 ON t1.create_by = t2.id
- t1.is_deleted = 0
AND (
t1.content LIKE concat('%',#{queryParams.keywords},'%')
@@ -47,48 +46,6 @@
ORDER BY
t1.create_time DESC
-
-
@@ -113,7 +69,6 @@
sys_log
WHERE
create_time BETWEEN #{startDate} AND #{endDate}
- AND is_deleted = 0
GROUP BY
DATE_FORMAT(create_time, '%Y-%m-%d')
@@ -134,30 +89,6 @@
2) AS growthRate
FROM
sys_log
- WHERE
- is_deleted = 0
-
-
-
@@ -176,33 +107,6 @@
2) AS growthRate
FROM
sys_log
- WHERE
- is_deleted = 0
-
-
-
diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml
index 2f15b75e..9ddac65b 100644
--- a/src/main/resources/mapper/system/UserMapper.xml
+++ b/src/main/resources/mapper/system/UserMapper.xml
@@ -72,84 +72,8 @@
u.id
-
- ORDER BY u.${queryParams.field} ${queryParams.direction}
-
-
-
- ORDER BY u.update_time DESC, u.create_time DESC
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/codegen/query.java.vm b/src/main/resources/templates/codegen/query.java.vm
index d9716036..3707d96c 100644
--- a/src/main/resources/templates/codegen/query.java.vm
+++ b/src/main/resources/templates/codegen/query.java.vm
@@ -1,6 +1,6 @@
package ${packageName}.${moduleName}.${subpackageName};
-import ${packageName}.common.base.BasePageQuery;
+import ${packageName}.common.base.BaseQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -21,7 +21,7 @@ import java.math.BigDecimal;
@Schema(description ="$!{businessName}查询对象")
@Getter
@Setter
-public class ${entityName}Query extends BasePageQuery {
+public class ${entityName}Query extends BaseQuery {
#if($fieldConfigs)
#foreach($fieldConfig in ${fieldConfigs})