From 693a33f660891c98b8b95490d020c428c5da9871 Mon Sep 17 00:00:00 2001
From: 抓蛙师 <770492966@qq.com>
Date: 星期一, 19 九月 2022 21:46:32 +0800
Subject: [PATCH] 完善功能：前端可以配置多排序参数支持依次排序 如：{isAsc:"asc",orderByColumn:"id"} {isAsc:"asc",orderByColumn:"id,createTime"} {isAsc:"asc,desc",orderByColumn:"id,createTime"} 共三种配置方式
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 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 f3e2c4a..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
@@ -3,11 +3,14 @@
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 java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
/**
* 鍒嗛〉鏌ヨ瀹炰綋绫�
@@ -57,28 +60,51 @@
pageNum = DEFAULT_PAGE_NUM;
}
Page<T> page = new Page<>(pageNum, pageSize);
- OrderItem orderItem = buildOrderItem();
- if (ObjectUtil.isNotNull(orderItem)) {
- page.addOrder(orderItem);
+ List<OrderItem> orderItems = buildOrderItem();
+ if (ObjectUtil.isNotNull(orderItems)) {
+ page.addOrder(orderItems);
}
return page;
}
- private OrderItem buildOrderItem() {
- // 鍏煎鍓嶇鎺掑簭绫诲瀷
- if ("ascending".equals(isAsc)) {
- isAsc = "asc";
- } else if ("descending".equals(isAsc)) {
- isAsc = "desc";
- }
- if (StringUtils.isNotBlank(orderByColumn)) {
+ 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);
- if ("asc".equals(isAsc)) {
- return OrderItem.asc(orderBy);
- } else if ("desc".equals(isAsc)) {
- return OrderItem.desc(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