From 3eda001d6cdf80e0111a20d1464afa9d207834ed Mon Sep 17 00:00:00 2001 From: sunzheng Date: Wed, 31 Jul 2024 17:23:01 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=8F=8B=E6=83=85=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsFriendlyLinksController.java | 31 ++++++++++++++++--- .../service/ILawsFriendlyLinksService.java | 11 +++++++ .../impl/LawsFriendlyLinksServiceImpl.java | 19 ++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java index 08656d2a..dcc71019 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; @@ -46,17 +46,39 @@ public class LawsFriendlyLinksController extends JeroController> queryList(LawsFriendlyLinks lawsFriendlyLinks, HttpServletRequest req) { - List list = lawsFriendlyLinksService.queryList(lawsFriendlyLinks, req); - list = list.stream().sorted(Comparator.comparing(LawsFriendlyLinks::getSort)).collect(Collectors.toList()); + String countStr = req.getParameter("count"); + int count = (countStr != null) ? Integer.parseInt(countStr) : Integer.MAX_VALUE; // 如果 count 参数为空，返回所有结果 + + List list = lawsFriendlyLinksService.queryList(lawsFriendlyLinks, req); + // 排序并限制返回条数 + list = list.stream() + .sorted(Comparator.comparing(LawsFriendlyLinks::getSort)) // 从小到大排序 + .limit(count) // 限制返回的条数 + .collect(Collectors.toList()); return Result.OK(list); } + /** + * 分页查询 + */ + @RequiresPermissions("sys:friendshipLink:search") + @AutoLog(value = "友情链接管理-分页查询") + @ApiOperationSupport(order = 1) + @ApiOperation(value="友情链接管理-分页查询", notes="友情链接管理-分页查询") + @GetMapping(value = "/page") + public Result> queryPageList(LawsFriendlyLinks lawsFriendlyLinks, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = lawsFriendlyLinksService.queryPageList(lawsFriendlyLinks, req, pageNo, pageSize); + return Result.OK(pageList); + } + /** * 添加 */ @@ -92,6 +114,7 @@ public class LawsFriendlyLinksController extends JeroController { * 批量删除 */ void deleteByIds(List ids); + + /** + * 分页查询 + * @param lawsFriendlyLinks + * @param req + * @param pageNo + * @param pageSize + * @return + */ + IPage queryPageList(LawsFriendlyLinks lawsFriendlyLinks, HttpServletRequest req, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsFriendlyLinksServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsFriendlyLinksServiceImpl.java index a0b9b316..d28d14a4 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsFriendlyLinksServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsFriendlyLinksServiceImpl.java @@ -1,5 +1,8 @@ package com.jero.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.sys.entity.LawsFriendlyLinks; import com.jero.modules.sys.mapper.LawsFriendlyLinksMapper; import com.jero.modules.sys.service.ILawsFriendlyLinksService; @@ -68,4 +71,20 @@ public class LawsFriendlyLinksServiceImpl extends ServiceImpl queryPageList(LawsFriendlyLinks lawsFriendlyLinks, HttpServletRequest req, Integer pageNo, Integer pageSize) { + Page page = new Page(pageNo, pageSize); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsFriendlyLinks, req.getParameterMap()); + queryWrapper.lambda().orderByAsc(LawsFriendlyLinks::getSort); + return page(page,queryWrapper); + } }