From 663024ac7fe2c1a60d151e4e645e5e0f553366a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 20 九月 2022 10:46:43 +0800
Subject: [PATCH] update 优化 pr235 解决小问题与优化写法
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 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 c073a94..60abde6 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,5 +1,6 @@
package com.ruoyi.common.core.domain;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,52 +62,51 @@
}
Page<T> page = new Page<>(pageNum, pageSize);
List<OrderItem> orderItems = buildOrderItem();
- if (ObjectUtil.isNotNull(orderItems)) {
+ if (CollUtil.isNotEmpty(orderItems)) {
page.addOrder(orderItems);
}
return page;
}
+ /**
+ * 鏋勫缓鎺掑簭
+ *
+ * 鏀寔鐨勭敤娉曞涓�:
+ * {isAsc:"asc",orderByColumn:"id"} order by id asc
+ * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc
+ * {isAsc:"desc",orderByColumn:"id,createTime"} order by id desc,create_time desc
+ * {isAsc:"asc,desc",orderByColumn:"id,createTime"} order by id asc,create_time desc
+ */
private List<OrderItem> buildOrderItem() {
- if (StringUtils.isNotBlank(isAsc) && StringUtils.isNotBlank(orderByColumn)) {
- // 鍏煎鍓嶇鎺掑簭绫诲瀷
- isAsc = isAsc.replace("ascending", "asc")
- .replace("descending", "desc");
+ if (StringUtils.isBlank(orderByColumn) || StringUtils.isBlank(isAsc)) {
+ return null;
+ }
+ String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
+ orderBy = StringUtils.toUnderScoreCase(orderBy);
- 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) {
+ // 鍏煎鍓嶇鎺掑簭绫诲瀷
+ isAsc = StringUtils.replaceEach(isAsc, new String[]{"ascending", "descending"}, new String[]{"asc", "desc"});
+
+ String[] orderByArr = orderBy.split(",");
+ String[] isAscArr = isAsc.split(",");
+ if (isAscArr.length != 1 && isAscArr.length != orderByArr.length) {
+ throw new ServiceException("鎺掑簭鍙傛暟鏈夎");
+ }
+
+ List<OrderItem> list = new ArrayList<>();
+ // 姣忎釜瀛楁鍚勮嚜鎺掑簭
+ for (int i = 0; i < orderByArr.length; i++) {
+ String orderByStr = orderByArr[i];
+ String isAscStr = isAscArr.length == 1 ? isAscArr[0] : isAscArr[i];
+ if ("asc".equals(isAscStr)) {
+ list.add(OrderItem.asc(orderByStr));
+ } else if ("desc".equals(isAscStr)) {
+ list.add(OrderItem.desc(orderByStr));
+ } else {
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;
+ return list;
}
}
--
Gitblit v1.9.3