diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmLogsController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmLogsController.java index 9f0ff50..f284767 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmLogsController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmLogsController.java @@ -46,9 +46,12 @@ public class AlgorithmLogsController { @PostMapping("/testQueryWrapperBuilder") @ApiOperation("测试构造器") public ResponseResult testQueryWrapperBuilder(@RequestBody QueryCondition queryCondition) { + Page page = new Page<>(); + page.setSize(queryCondition.getSize()); + page.setCurrent(queryCondition.getCurrent()); QueryWrapper queryWrapper = QueryWrapperBuilder.build(queryCondition, AlgorithmLogs.class); - List list = algorithmLogsService.list(queryWrapper); - return ResponseResult.successData(list); + Page algorithmLogsPage = algorithmLogsService.page(page, queryWrapper); + return ResponseResult.successData(algorithmLogsPage); } } diff --git a/riis-system/src/main/java/com/yfd/platform/utils/wrapper/QueryCondition.java b/riis-system/src/main/java/com/yfd/platform/utils/wrapper/QueryCondition.java index 5ac6ab9..de6a0a7 100644 --- a/riis-system/src/main/java/com/yfd/platform/utils/wrapper/QueryCondition.java +++ b/riis-system/src/main/java/com/yfd/platform/utils/wrapper/QueryCondition.java @@ -1,15 +1,23 @@ package com.yfd.platform.utils.wrapper; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; import java.util.Map; @Data +@ApiModel("查询构造器") public class QueryCondition { - private Integer page; + @ApiModelProperty("当前页") + private Integer current; + @ApiModelProperty("页大小") private Integer size; + @ApiModelProperty("条件过滤器") private Map filters; - private List sortOrders; // 修改为 SortOrder 列表 + // 修改为 SortOrder 列表 + @ApiModelProperty("分页参数") + private List sortOrders; }