From 31db658929768474275accfb73bc5ad76b2cb4d1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 15 五月 2021 11:32:05 +0800
Subject: [PATCH] update 增强分页工具兼容性
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
index e484f6d..cf3f886 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
@@ -37,9 +37,25 @@
*/
public static final String IS_ASC = "isAsc";
+ /**
+ * 褰撳墠璁板綍璧峰绱㈠紩 榛樿鍊�
+ */
+ public static final int DEFAULT_PAGE_NUM = 1;
+
+ /**
+ * 姣忛〉鏄剧ず璁板綍鏁� 榛樿鍊�
+ */
+ public static final int DEFAULT_PAGE_SIZE = 10;
+
+ /**
+ * 鏋勫缓 plus 鍒嗛〉瀵硅薄
+ * @param <T> domain 瀹炰綋
+ * @param <K> vo 瀹炰綋
+ * @return 鍒嗛〉瀵硅薄
+ */
public static <T, K> PagePlus<T, K> buildPagePlus() {
- Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM);
- Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE);
+ Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
+ Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
String isAsc = ServletUtils.getParameter(IS_ASC);
PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
@@ -54,9 +70,14 @@
return page;
}
+ /**
+ * 鏋勫缓 MP 鏅�氬垎椤靛璞�
+ * @param <T> domain 瀹炰綋
+ * @return 鍒嗛〉瀵硅薄
+ */
public static <T> Page<T> buildPage() {
- Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM);
- Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE);
+ Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
+ Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
String isAsc = ServletUtils.getParameter(IS_ASC);
Page<T> page = new Page<>(pageNum, pageSize);
--
Gitblit v1.9.3