From 9e5b64e1b75ff8969e840011aced580c93721a20 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 15 十二月 2021 23:33:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 63 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 35 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 16a5a24..5042de4 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
@@ -2,6 +2,7 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.PageQuery;
@@ -17,7 +18,9 @@
* 鍒嗛〉宸ュ叿
*
* @author Lion Li
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageQuery} 涓� {@link TableDataInfo}
*/
+@Deprecated
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class PageUtils {
@@ -48,11 +51,13 @@
/**
* 褰撳墠璁板綍璧峰绱㈠紩 榛樿鍊�
*/
+ @Deprecated
public static final int DEFAULT_PAGE_NUM = 1;
/**
* 姣忛〉鏄剧ず璁板綍鏁� 榛樿鍊� 榛樿鏌ュ叏閮�
*/
+ @Deprecated
public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
/**
@@ -61,7 +66,7 @@
* @param <T> domain 瀹炰綋
* @param <K> vo 瀹炰綋
* @return 鍒嗛〉瀵硅薄
- * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageUtils#buildPagePlus(PageQuery)}
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageQuery#build()}
* 鐢变簬浣跨敤 Servlet 鑾峰彇鍙兘浠� param 鑾峰彇 鐏垫椿鎬ч檷浣� 鏁呭皢浼犲弬鎿嶄綔浜ょ粰鐢ㄦ埛
*/
@Deprecated
@@ -70,22 +75,6 @@
Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
String isAsc = ServletUtils.getParameter(IS_ASC);
- if (pageNum <= 0) {
- pageNum = DEFAULT_PAGE_NUM;
- }
- PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
- OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
- if (ObjectUtil.isNotNull(orderItem)) {
- page.addOrder(orderItem);
- }
- return page;
- }
-
- public static <T, K> PagePlus<T, K> buildPagePlus(PageQuery pageQuery) {
- Integer pageNum = ObjectUtil.defaultIfNull(pageQuery.getPageNum(), DEFAULT_PAGE_NUM);
- Integer pageSize = ObjectUtil.defaultIfNull(pageQuery.getPageSize(), DEFAULT_PAGE_SIZE);
- String orderByColumn = pageQuery.getOrderByColumn();
- String isAsc = pageQuery.getIsAsc();
if (pageNum <= 0) {
pageNum = DEFAULT_PAGE_NUM;
}
@@ -107,7 +96,7 @@
*
* @param <T> domain 瀹炰綋
* @return 鍒嗛〉瀵硅薄
- * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageUtils#buildPage(PageQuery)}
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageQuery#build()}
* 鐢变簬浣跨敤 Servlet 鑾峰彇鍙兘浠� param 鑾峰彇 鐏垫椿鎬ч檷浣� 鏁呭皢浼犲弬鎿嶄綔浜ょ粰鐢ㄦ埛
*/
@Deprecated
@@ -126,23 +115,6 @@
}
return page;
}
-
- public static <T> Page<T> buildPage(PageQuery pageQuery) {
- Integer pageNum = ObjectUtil.defaultIfNull(pageQuery.getPageNum(), DEFAULT_PAGE_NUM);
- Integer pageSize = ObjectUtil.defaultIfNull(pageQuery.getPageSize(), DEFAULT_PAGE_SIZE);
- String orderByColumn = pageQuery.getOrderByColumn();
- String isAsc = pageQuery.getIsAsc();
- if (pageNum <= 0) {
- pageNum = DEFAULT_PAGE_NUM;
- }
- Page<T> page = new Page<>(pageNum, pageSize);
- OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
- if (ObjectUtil.isNotNull(orderItem)) {
- page.addOrder(orderItem);
- }
- return page;
- }
-
private static OrderItem buildOrderItem(String orderByColumn, String isAsc) {
// 鍏煎鍓嶇鎺掑簭绫诲瀷
@@ -163,6 +135,15 @@
return null;
}
+ /**
+ * 鏋勫缓 MP 鏅�氬垎椤靛璞�
+ *
+ * @param <T> domain 瀹炰綋
+ * @return 鍒嗛〉瀵硅薄
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageQuery#build()}
+ * 鐢变簬浣跨敤 Servlet 鑾峰彇鍙兘浠� param 鑾峰彇 鐏垫椿鎬ч檷浣� 鏁呭皢浼犲弬鎿嶄綔浜ょ粰鐢ㄦ埛
+ */
+ @Deprecated
public static <T, K> TableDataInfo<K> buildDataInfo(PagePlus<T, K> page) {
TableDataInfo<K> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
@@ -172,6 +153,10 @@
return rspData;
}
+ /**
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link TableDataInfo#build(IPage)}
+ */
+ @Deprecated
public static <T> TableDataInfo<T> buildDataInfo(Page<T> page) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
@@ -181,6 +166,10 @@
return rspData;
}
+ /**
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link TableDataInfo#build(List)}
+ */
+ @Deprecated
public static <T> TableDataInfo<T> buildDataInfo(List<T> list) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
@@ -190,6 +179,10 @@
return rspData;
}
+ /**
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link TableDataInfo#build()}
+ */
+ @Deprecated
public static <T> TableDataInfo<T> buildDataInfo() {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
--
Gitblit v1.9.3