From 0e75aa6250b4e244b83823e3fd7d941e84c2897d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 20 九月 2022 10:45:06 +0800
Subject: [PATCH] !235 update 多排序参数支持 Merge pull request !235 from 抓蛙师/auto-7465549-dev-e641f38b
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 8 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
index 4559ac9..c073a94 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
@@ -1,10 +1,16 @@
package com.ruoyi.common.core.domain;
-import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sql.SqlUtil;
import lombok.Data;
-import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
/**
* 鍒嗛〉鏌ヨ瀹炰綋绫�
@@ -13,33 +19,94 @@
*/
@Data
-@Accessors(chain = true)
public class PageQuery implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
* 鍒嗛〉澶у皬
*/
- @ApiModelProperty("鍒嗛〉澶у皬")
private Integer pageSize;
/**
* 褰撳墠椤垫暟
*/
- @ApiModelProperty("褰撳墠椤垫暟")
private Integer pageNum;
/**
* 鎺掑簭鍒�
*/
- @ApiModelProperty("鎺掑簭鍒�")
private String orderByColumn;
/**
* 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc
*/
- @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
private String isAsc;
+ /**
+ * 褰撳墠璁板綍璧峰绱㈠紩 榛樿鍊�
+ */
+ public static final int DEFAULT_PAGE_NUM = 1;
+
+ /**
+ * 姣忛〉鏄剧ず璁板綍鏁� 榛樿鍊� 榛樿鏌ュ叏閮�
+ */
+ public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
+
+ public <T> Page<T> build() {
+ Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM);
+ Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE);
+ if (pageNum <= 0) {
+ pageNum = DEFAULT_PAGE_NUM;
+ }
+ Page<T> page = new Page<>(pageNum, pageSize);
+ List<OrderItem> orderItems = buildOrderItem();
+ if (ObjectUtil.isNotNull(orderItems)) {
+ page.addOrder(orderItems);
+ }
+ return page;
+ }
+
+ private List<OrderItem> buildOrderItem() {
+ if (StringUtils.isNotBlank(isAsc) && StringUtils.isNotBlank(orderByColumn)) {
+ // 鍏煎鍓嶇鎺掑簭绫诲瀷
+ isAsc = isAsc.replace("ascending", "asc")
+ .replace("descending", "desc");
+
+ String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
+ orderBy = StringUtils.toUnderScoreCase(orderBy);
+ //鍒嗗壊orderByColumn鍜宨sAsc鍙傛暟
+ String[] orderByArr = orderBy.split(",");
+ String[] isAscArr = isAsc.split(",");
+ if (isAscArr.length != 1 && isAscArr.length != orderByArr.length) {
+ throw new ServiceException("鎺掑簭鍙傛暟鏈夎");
+ }
+ if (isAscArr.length == 1) {
+ //isAsc鍙彁渚涗簡涓�涓� 鍒欏叏閮ㄥ瓧娈甸兘鏄姝ゆ帓搴�
+ if ("asc".equals(isAsc)) {
+ return OrderItem.ascs(orderBy);
+ } else if ("desc".equals(isAsc)) {
+ return OrderItem.descs(orderBy);
+ } else {
+ throw new ServiceException("isAsc鍙傛暟鏈夎");
+ }
+ }
+ ArrayList<OrderItem> list = new ArrayList<>();
+ //姣忎釜瀛楁鍚勮嚜鎺掑簭
+ for (int i = 0; i < isAscArr.length; i++) {
+ String isAscStr = isAscArr[i];
+ String orderByStr = orderByArr[i];
+ if ("asc".equals(isAscStr)) {
+ list.add(OrderItem.asc(orderByStr));
+ } else if ("desc".equals(isAscStr)) {
+ list.add(OrderItem.desc(orderByStr));
+ } else {
+ throw new ServiceException("isAsc鍙傛暟鏈夎");
+ }
+ }
+ return list;
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3