From c4e17ff8472fd9f8123e86b593b2968ad5936b15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 01 十一月 2021 13:49:11 +0800
Subject: [PATCH] fix 修复 xxl-job-admin 部署问题
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 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 d5b72f7..b358e3b 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,6 +1,5 @@
package com.ruoyi.common.utils;
-import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -49,6 +48,7 @@
/**
* 鏋勫缓 plus 鍒嗛〉瀵硅薄
+ *
* @param <T> domain 瀹炰綋
* @param <K> vo 瀹炰綋
* @return 鍒嗛〉瀵硅薄
@@ -58,38 +58,56 @@
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);
- if (StrUtil.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));
- }
+ if (pageNum <= 0) {
+ pageNum = DEFAULT_PAGE_NUM;
}
+ PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
+ OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
+ page.addOrder(orderItem);
return page;
+ }
+
+ public static <T> Page<T> buildPage() {
+ return buildPage(null, null);
}
/**
* 鏋勫缓 MP 鏅�氬垎椤靛璞�
+ *
* @param <T> domain 瀹炰綋
* @return 鍒嗛〉瀵硅薄
*/
- public static <T> Page<T> buildPage() {
+ 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);
- String isAsc = ServletUtils.getParameter(IS_ASC);
+ String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn);
+ String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc);
+ if (pageNum <= 0) {
+ pageNum = DEFAULT_PAGE_NUM;
+ }
Page<T> page = new Page<>(pageNum, pageSize);
- if (StrUtil.isNotBlank(orderByColumn)) {
+ OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
+ 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)) {
- page.addOrder(OrderItem.asc(orderBy));
+ return OrderItem.asc(orderBy);
} else if ("desc".equals(isAsc)) {
- page.addOrder(OrderItem.desc(orderBy));
+ return OrderItem.desc(orderBy);
}
}
- return page;
+ return null;
}
public static <T, K> TableDataInfo<K> buildDataInfo(PagePlus<T, K> page) {
@@ -119,4 +137,11 @@
return rspData;
}
+ public static <T> TableDataInfo<T> buildDataInfo() {
+ TableDataInfo<T> rspData = new TableDataInfo<>();
+ rspData.setCode(HttpStatus.HTTP_OK);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ return rspData;
+ }
+
}
--
Gitblit v1.9.3