admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!235 update 多排序参数支持

Browse Source 
Merge pull request !235 from 抓蛙师/auto-7465549-dev-e641f38b
This commit is contained in:
疯狂的狮子Li 2022-09-20 02:45:06 +00:00 committed by Gitee
commit 0e75aa6250
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
View File

@ -3,11 +3,14 @@ package com.ruoyi.common.core.domain;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil; import com.ruoyi.common.utils.sql.SqlUtil;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/** /**
* 分页查询实体类 * 分页查询实体类
@ -57,28 +60,51 @@ public class PageQuery implements Serializable {
pageNum = DEFAULT_PAGE_NUM; pageNum = DEFAULT_PAGE_NUM;
} }
Page<T> page = new Page<>(pageNum, pageSize); Page<T> page = new Page<>(pageNum, pageSize);
OrderItem orderItem = buildOrderItem(); List<OrderItem> orderItems = buildOrderItem();
if (ObjectUtil.isNotNull(orderItem)) { if (ObjectUtil.isNotNull(orderItems)) {
page.addOrder(orderItem); page.addOrder(orderItems);
} }
return page; return page;
} }
private OrderItem buildOrderItem() { private List<OrderItem> buildOrderItem() {
if (StringUtils.isNotBlank(isAsc) && StringUtils.isNotBlank(orderByColumn)) {
// 兼容前端排序类型 // 兼容前端排序类型
if ("ascending".equals(isAsc)) { isAsc = isAsc.replace("ascending", "asc")
isAsc = "asc"; .replace("descending", "desc");
} else if ("descending".equals(isAsc)) {
isAsc = "desc";
}
if (StringUtils.isNotBlank(orderByColumn)) {
String orderBy = SqlUtil.escapeOrderBySql(orderByColumn); String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
orderBy = StringUtils.toUnderScoreCase(orderBy); orderBy = StringUtils.toUnderScoreCase(orderBy);
if ("asc".equals(isAsc)) { //分割orderByColumn和isAsc参数
return OrderItem.asc(orderBy); String[] orderByArr = orderBy.split(",");
} else if ("desc".equals(isAsc)) { String[] isAscArr = isAsc.split(",");
return OrderItem.desc(orderBy); 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; return null;
} }