From c65acd6a28e15d95459e1f835856b384eabde2a8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 30 七月 2021 19:10:54 +0800
Subject: [PATCH] update 重写 防重提交拦截器 支持全局与注解自定义 拦截时间配置配置 优化逻辑
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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..bb3d3e2 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 = Integer.MAX_VALUE;
+
+ /**
+ * 鏋勫缓 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,15 +70,31 @@
return page;
}
- public static <T> Page<T> buildPage() {
- Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM);
- Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE);
- String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
- String isAsc = ServletUtils.getParameter(IS_ASC);
+ public static <T> Page<T> buildPage() {
+ return buildPage(null, null);
+ }
+
+ /**
+ * 鏋勫缓 MP 鏅�氬垎椤靛璞�
+ * @param <T> domain 瀹炰綋
+ * @return 鍒嗛〉瀵硅薄
+ */
+ 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);
+ // 鍏煎鍓嶇鎺掑簭绫诲瀷
+ if ("ascending".equals(isAsc)) {
+ isAsc = "asc";
+ } else if ("descending".equals(isAsc)) {
+ isAsc = "desc";
+ }
Page<T> page = new Page<>(pageNum, pageSize);
if (StrUtil.isNotBlank(orderByColumn)) {
String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
- if ("asc".equals(isAsc)) {
+ orderBy = StrUtil.toUnderlineCase(orderBy);
+ if ("asc".equals(isAsc)) {
page.addOrder(OrderItem.asc(orderBy));
} else if ("desc".equals(isAsc)) {
page.addOrder(OrderItem.desc(orderBy));
--
Gitblit v1.9.3