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

remove 移除分页合理化参数 使用 MP 全局配置分页溢出

Browse Source
This commit is contained in:
疯狂的狮子li 2021-09-02 15:59:42 +08:00
parent ab9bc35f9f
commit 80784433b8
17 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
View File

@ -36,11 +36,6 @@ public class PageUtils {
*/
public static final String IS_ASC = "isAsc";
/**
* 分页参数合理化
*/
private static final String REASONABLE = "reasonable";
/**
* 当前记录起始索引 默认值
*/
@ -51,11 +46,6 @@ public class PageUtils {
*/
public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
/**
* 分页参数合理化 默认值
*/
private static final Boolean DEFAULT_REASONABLE = Boolean.TRUE;
/**
* 构建 plus 分页对象
* @param <T> domain 实体
@ -67,10 +57,8 @@ public class PageUtils {
Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
String isAsc = ServletUtils.getParameter(IS_ASC);
Boolean reasonable = ServletUtils.getParameterToBool(REASONABLE, DEFAULT_REASONABLE);
//分页合理化，针对不合理的页码自动处理
if (reasonable && pageNum <= 0) {
pageNum = 1;
if (pageNum <= 0) {
pageNum = DEFAULT_PAGE_NUM;
}
PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
if (StringUtils.isNotBlank(orderByColumn)) {
@ -98,10 +86,8 @@ public class PageUtils {
Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn);
String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc);
Boolean reasonable = ServletUtils.getParameterToBool(REASONABLE, DEFAULT_REASONABLE);
//分页合理化，针对不合理的页码自动处理
if (reasonable && pageNum <= 0) {
pageNum = 1;
if (pageNum <= 0) {
pageNum = DEFAULT_PAGE_NUM;
}
// 兼容前端排序类型
if ("ascending".equals(isAsc)) {

1
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -367,7 +367,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
#foreach ($column in $columns)
#if($column.query)
$column.javaField: undefined#if($velocityCount != $columns.size()),#end

1
ruoyi-ui/src/views/demo/demo/index.vue
View File

@ -205,7 +205,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
testKey: undefined,
value: undefined,
createTime: undefined,

1
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -320,7 +320,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
jobName: undefined,
jobGroup: undefined,
status: undefined

1
ruoyi-ui/src/views/monitor/job/log.vue
View File

@ -220,7 +220,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
jobName: undefined,
jobGroup: undefined,
status: undefined

1
ruoyi-ui/src/views/monitor/logininfor/index.vue
View File

@ -153,7 +153,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
ipaddr: undefined,
userName: undefined,
status: undefined

1
ruoyi-ui/src/views/system/config/index.vue
View File

@ -219,7 +219,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
configName: undefined,
configKey: undefined,
configType: undefined

1
ruoyi-ui/src/views/system/dict/data.vue
View File

@ -247,7 +247,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
dictName: undefined,
dictType: undefined,
status: undefined

1
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -227,7 +227,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
dictName: undefined,
dictType: undefined,
status: undefined

1
ruoyi-ui/src/views/system/notice/index.vue
View File

@ -204,7 +204,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
noticeTitle: undefined,
createBy: undefined,
status: undefined

1
ruoyi-ui/src/views/system/oss/config.vue
View File

@ -223,7 +223,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
configKey: undefined,
bucketName: undefined,
status: undefined,

1
ruoyi-ui/src/views/system/oss/index.vue
View File

@ -226,7 +226,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
fileName: undefined,
originalName: undefined,
fileSuffix: undefined,

1
ruoyi-ui/src/views/system/post/index.vue
View File

@ -192,7 +192,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
postCode: undefined,
postName: undefined,
status: undefined

1
ruoyi-ui/src/views/system/role/authUser.vue
View File

@ -128,7 +128,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
roleId: undefined,
userName: undefined,
phonenumber: undefined

1
ruoyi-ui/src/views/system/role/index.vue
View File

@ -328,7 +328,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
roleName: undefined,
roleKey: undefined,
status: undefined

1
ruoyi-ui/src/views/system/user/index.vue
View File

@ -418,7 +418,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
userName: undefined,
phonenumber: undefined,
status: undefined,

1
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -219,7 +219,6 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
tableName: undefined,
tableComment: undefined
},