From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 125 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 42 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 67cf72c..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
@@ -1,11 +1,16 @@
package com.ruoyi.common.utils;
+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;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.sql.SqlUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import java.util.List;
@@ -13,115 +18,132 @@
* 鍒嗛〉宸ュ叿
*
* @author Lion Li
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageQuery} 涓� {@link TableDataInfo}
*/
+@Deprecated
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class PageUtils {
/**
* 褰撳墠璁板綍璧峰绱㈠紩
*/
+ @Deprecated
public static final String PAGE_NUM = "pageNum";
/**
* 姣忛〉鏄剧ず璁板綍鏁�
*/
+ @Deprecated
public static final String PAGE_SIZE = "pageSize";
/**
* 鎺掑簭鍒�
*/
+ @Deprecated
public static final String ORDER_BY_COLUMN = "orderByColumn";
/**
* 鎺掑簭鐨勬柟鍚� "desc" 鎴栬�� "asc".
*/
+ @Deprecated
public static final String IS_ASC = "isAsc";
-
- /**
- * 鍒嗛〉鍙傛暟鍚堢悊鍖�
- */
- private static final String REASONABLE = "reasonable";
/**
* 褰撳墠璁板綍璧峰绱㈠紩 榛樿鍊�
*/
+ @Deprecated
public static final int DEFAULT_PAGE_NUM = 1;
/**
* 姣忛〉鏄剧ず璁板綍鏁� 榛樿鍊� 榛樿鏌ュ叏閮�
*/
+ @Deprecated
public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
/**
- * 鍒嗛〉鍙傛暟鍚堢悊鍖� 榛樿鍊�
- */
- private static final Boolean DEFAULT_REASONABLE = Boolean.TRUE;
-
- /**
* 鏋勫缓 plus 鍒嗛〉瀵硅薄
+ *
* @param <T> domain 瀹炰綋
* @param <K> vo 瀹炰綋
* @return 鍒嗛〉瀵硅薄
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageQuery#build()}
+ * 鐢变簬浣跨敤 Servlet 鑾峰彇鍙兘浠� param 鑾峰彇 鐏垫椿鎬ч檷浣� 鏁呭皢浼犲弬鎿嶄綔浜ょ粰鐢ㄦ埛
*/
+ @Deprecated
public static <T, K> PagePlus<T, K> buildPagePlus() {
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);
- Boolean reasonable = ServletUtils.getParameterToBool(REASONABLE, DEFAULT_REASONABLE);
- //鍒嗛〉鍚堢悊鍖栵紝閽堝涓嶅悎鐞嗙殑椤电爜鑷姩澶勭悊
- if (reasonable && pageNum <= 0) {
- pageNum = 1;
+ if (pageNum <= 0) {
+ pageNum = DEFAULT_PAGE_NUM;
}
PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
- if (StringUtils.isNotBlank(orderByColumn)) {
- String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
- if ("asc".equals(isAsc)) {
- page.addOrder(OrderItem.asc(orderBy));
- } else if ("desc".equals(isAsc)) {
- page.addOrder(OrderItem.desc(orderBy));
- }
+ OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
+ if (ObjectUtil.isNotNull(orderItem)) {
+ page.addOrder(orderItem);
}
return page;
}
- public static <T> Page<T> buildPage() {
- return buildPage(null, null);
- }
+ @Deprecated
+ public static <T> Page<T> buildPage() {
+ return buildPage(null, null);
+ }
/**
* 鏋勫缓 MP 鏅�氬垎椤靛璞�
+ *
* @param <T> domain 瀹炰綋
* @return 鍒嗛〉瀵硅薄
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageQuery#build()}
+ * 鐢变簬浣跨敤 Servlet 鑾峰彇鍙兘浠� param 鑾峰彇 鐏垫椿鎬ч檷浣� 鏁呭皢浼犲弬鎿嶄綔浜ょ粰鐢ㄦ埛
*/
+ @Deprecated
public static <T> Page<T> buildPage(String defaultOrderByColumn, String defaultIsAsc) {
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, defaultOrderByColumn);
String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc);
- Boolean reasonable = ServletUtils.getParameterToBool(REASONABLE, DEFAULT_REASONABLE);
- //鍒嗛〉鍚堢悊鍖栵紝閽堝涓嶅悎鐞嗙殑椤电爜鑷姩澶勭悊
- if (reasonable && pageNum <= 0) {
- pageNum = 1;
+ if (pageNum <= 0) {
+ pageNum = DEFAULT_PAGE_NUM;
}
- // 鍏煎鍓嶇鎺掑簭绫诲瀷
- if ("ascending".equals(isAsc)) {
- isAsc = "asc";
- } else if ("descending".equals(isAsc)) {
- isAsc = "desc";
- }
Page<T> page = new Page<>(pageNum, pageSize);
- if (StringUtils.isNotBlank(orderByColumn)) {
- String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
- orderBy = StringUtils.toUnderScoreCase(orderBy);
- if ("asc".equals(isAsc)) {
- page.addOrder(OrderItem.asc(orderBy));
- } else if ("desc".equals(isAsc)) {
- page.addOrder(OrderItem.desc(orderBy));
- }
+ OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
+ if (ObjectUtil.isNotNull(orderItem)) {
+ page.addOrder(orderItem);
}
return page;
}
+ private static OrderItem buildOrderItem(String orderByColumn, String isAsc) {
+ // 鍏煎鍓嶇鎺掑簭绫诲瀷
+ if ("ascending".equals(isAsc)) {
+ isAsc = "asc";
+ } else if ("descending".equals(isAsc)) {
+ isAsc = "desc";
+ }
+ if (StringUtils.isNotBlank(orderByColumn)) {
+ String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
+ orderBy = StringUtils.toUnderScoreCase(orderBy);
+ if ("asc".equals(isAsc)) {
+ return OrderItem.asc(orderBy);
+ } else if ("desc".equals(isAsc)) {
+ return OrderItem.desc(orderBy);
+ }
+ }
+ 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);
@@ -131,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);
@@ -140,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);
@@ -149,4 +179,15 @@
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);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ return rspData;
+ }
+
}
--
Gitblit v1.9.3