This commit is contained in:
zhangzhiqiang
2022-12-15 15:45:52 +08:00
parent 8e9d214f44
commit 8fea54e226

View File

@@ -4,6 +4,7 @@ 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 lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable; import java.io.Serializable;
@@ -19,12 +20,12 @@ public class PageQuery implements Serializable {
/** /**
* 分页大小 * 分页大小
*/ */
private Integer pageSize; private Integer size;
/** /**
* 当前页数 * 当前页数
*/ */
private Integer pageNum; private Integer page;
/** /**
* 排序列 * 排序列
@@ -47,16 +48,21 @@ public class PageQuery implements Serializable {
public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
public <T> Page<T> build() { public <T> Page<T> build() {
Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM); Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM);
Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE); Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE);
if (pageNum <= 0) { if (pageNum <= 0) {
pageNum = DEFAULT_PAGE_NUM; pageNum = DEFAULT_PAGE_NUM;
} }
Page<T> page = new Page<>(pageNum, pageSize); Page<T> page = new Page<>(pageNum, pageSize);
OrderItem item = new OrderItem(); if (StringUtils.isNotEmpty(sort)){
item.setColumn(sort); String[] split = sort.split(",");
item.setAsc(isAsc); for (String col : split) {
page.addOrder(item); OrderItem item = new OrderItem();
item.setColumn(col);
item.setAsc(isAsc);
page.addOrder(item);
}
}
return page; return page;
} }
} }