Merge remote-tracking branch 'origin/master'

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<LawsFriendlyLink
     /**
 	 * 列表查询
 	 */
-	@RequiresPermissions("sys:friendshipLink:search")
 	@AutoLog(value = "友情链接管理-列表查询")
 	@ApiOperationSupport(order = 1)
     @ApiOperation(value="友情链接管理-列表查询", notes="友情链接管理-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<LawsFriendlyLinks>> queryList(LawsFriendlyLinks lawsFriendlyLinks, HttpServletRequest req) {
-        List<LawsFriendlyLinks> list = lawsFriendlyLinksService.queryList(lawsFriendlyLinks, req);
+		String countStr  = req.getParameter("count");
-		list = list.stream().sorted(Comparator.comparing(LawsFriendlyLinks::getSort)).collect(Collectors.toList());
+		int count = (countStr != null) ? Integer.parseInt(countStr) : Integer.MAX_VALUE; // 如果 count 参数为空，返回所有结果
+
+		List<LawsFriendlyLinks> 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<IPage<LawsFriendlyLinks>> queryPageList(LawsFriendlyLinks lawsFriendlyLinks,
+														   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+														   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+														   HttpServletRequest req) {
+		 IPage<LawsFriendlyLinks> pageList = lawsFriendlyLinksService.queryPageList(lawsFriendlyLinks, req, pageNo, pageSize);
+		 return Result.OK(pageList);
+	 }
+
 	/**
 	 *   添加
 	 */
@@ -92,6 +114,7 @@ public class LawsFriendlyLinksController extends JeroController<LawsFriendlyLink
 	 * @param map
 	 * @return
 	 */
+	@RequiresPermissions("sys:friendshipLink:delete")
 	@AutoLog(value = "友情链接管理-通过id删除")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value="友情链接管理-通过id删除", notes="友情链接管理-通过id删除")

laws-modules/src/main/java/com/jero/modules/sys/service/ILawsFriendlyLinksService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.sys.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.sys.entity.LawsFriendlyLinks;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.servlet.http.HttpServletRequest;
@@ -37,4 +38,14 @@ public interface ILawsFriendlyLinksService extends IService<LawsFriendlyLinks> {
 	 * 批量删除
 	 */
     void deleteByIds(List<String> ids);
+
+	/**
+	 * 分页查询
+	 * @param lawsFriendlyLinks
+	 * @param req
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	IPage<LawsFriendlyLinks> queryPageList(LawsFriendlyLinks lawsFriendlyLinks, HttpServletRequest req, Integer pageNo, Integer pageSize);
 }

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<LawsFriendlyLinksM
         removeByIds(ids);
     }
 
+    /**
+     * 分页查询
+     *
+     * @param lawsFriendlyLinks
+     * @param req
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public IPage<LawsFriendlyLinks> queryPageList(LawsFriendlyLinks lawsFriendlyLinks, HttpServletRequest req, Integer pageNo, Integer pageSize) {
+        Page<LawsFriendlyLinks> page = new Page(pageNo, pageSize);
+        QueryWrapper<LawsFriendlyLinks> queryWrapper = QueryGenerator.initQueryWrapper(lawsFriendlyLinks, req.getParameterMap());
+        queryWrapper.lambda().orderByAsc(LawsFriendlyLinks::getSort);
+        return page(page,queryWrapper);
+    }
 }