From 09dfb25d735d26e08b81307515ec32708016da33 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 十二月 2021 12:20:21 +0800
Subject: [PATCH] update 修改 健康检查权限 改为用户放行 提高安全性
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 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 b358e3b..16a5a24 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,15 @@
package com.ruoyi.common.utils;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
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;
@@ -14,26 +18,31 @@
*
* @author Lion Li
*/
+@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";
/**
@@ -52,7 +61,10 @@
* @param <T> domain 瀹炰綋
* @param <K> vo 瀹炰綋
* @return 鍒嗛〉瀵硅薄
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageUtils#buildPagePlus(PageQuery)}
+ * 鐢变簬浣跨敤 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);
@@ -63,10 +75,29 @@
}
PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
- page.addOrder(orderItem);
+ 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;
+ }
+ PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
+ OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
+ if (ObjectUtil.isNotNull(orderItem)) {
+ page.addOrder(orderItem);
+ }
+ return page;
+ }
+
+ @Deprecated
public static <T> Page<T> buildPage() {
return buildPage(null, null);
}
@@ -76,7 +107,10 @@
*
* @param <T> domain 瀹炰綋
* @return 鍒嗛〉瀵硅薄
+ * @deprecated 3.6.0 鍒犻櫎 璇蜂娇鐢� {@link PageUtils#buildPage(PageQuery)}
+ * 鐢变簬浣跨敤 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);
@@ -87,10 +121,29 @@
}
Page<T> page = new Page<>(pageNum, pageSize);
OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
- page.addOrder(orderItem);
+ if (ObjectUtil.isNotNull(orderItem)) {
+ page.addOrder(orderItem);
+ }
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) {
// 鍏煎鍓嶇鎺掑簭绫诲瀷
if ("ascending".equals(isAsc)) {
--
Gitblit v1.9.3