Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-backend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
framework
cloud-backend
Commits
b83913ab
Commit
b83913ab
authored
Jun 20, 2024
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码
parent
0e8c2072
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
69 deletions
+10
-69
xxx-common-utils/src/main/java/com/zq/common/utils/PagingUtils.java
+4
-4
xxx-common-utils/src/main/java/com/zq/common/vo/PageReqVo.java
+2
-28
xxx-common-utils/src/main/java/com/zq/common/vo/PageVo.java
+4
-37
No files found.
xxx-common-utils/src/main/java/com/zq/common/utils/PagingUtils.java
View file @
b83913ab
...
@@ -56,7 +56,7 @@ public abstract class PagingUtils {
...
@@ -56,7 +56,7 @@ public abstract class PagingUtils {
public
static
<
E
,
Q
extends
PageReqVo
>
PageVo
<
E
>
paging
(
Q
reqVo
,
Function
<
Q
,
List
<
E
>>
rowsLoader
,
boolean
searchCount
)
{
public
static
<
E
,
Q
extends
PageReqVo
>
PageVo
<
E
>
paging
(
Q
reqVo
,
Function
<
Q
,
List
<
E
>>
rowsLoader
,
boolean
searchCount
)
{
PageHelper
.
startPage
(
reqVo
.
getPage
(),
reqVo
.
getSize
(),
searchCount
);
PageHelper
.
startPage
(
reqVo
.
getPage
(),
reqVo
.
getSize
(),
searchCount
);
com
.
github
.
pagehelper
.
Page
<
E
>
page
=
(
com
.
github
.
pagehelper
.
Page
)
rowsLoader
.
apply
(
reqVo
);
com
.
github
.
pagehelper
.
Page
<
E
>
page
=
(
com
.
github
.
pagehelper
.
Page
)
rowsLoader
.
apply
(
reqVo
);
return
PageVo
.
ofReqVo
(
reqVo
,
page
.
getResult
(),
Long
.
valueOf
(
page
.
getTotal
()).
intValue
());
return
PageVo
.
ofReqVo
(
reqVo
,
page
.
getResult
(),
page
.
getTotal
());
}
}
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓以下是mybatis-plus自带分页插件↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓以下是mybatis-plus自带分页插件↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
...
@@ -96,7 +96,7 @@ public abstract class PagingUtils {
...
@@ -96,7 +96,7 @@ public abstract class PagingUtils {
Page
<
E
>
page
=
new
Page
<>(
reqVo
.
getPage
(),
reqVo
.
getSize
());
Page
<
E
>
page
=
new
Page
<>(
reqVo
.
getPage
(),
reqVo
.
getSize
());
page
.
setSearchCount
(
searchCount
);
page
.
setSearchCount
(
searchCount
);
page
=
mapper
.
selectPage
(
page
,
Wrappers
.
lambdaQuery
(
entity
));
page
=
mapper
.
selectPage
(
page
,
Wrappers
.
lambdaQuery
(
entity
));
return
PageVo
.
ofReqVo
(
reqVo
,
page
.
getRecords
(),
Long
.
valueOf
(
page
.
getTotal
()).
intValue
());
return
PageVo
.
ofReqVo
(
reqVo
,
page
.
getRecords
(),
page
.
getTotal
());
}
}
/**
/**
...
@@ -125,7 +125,7 @@ public abstract class PagingUtils {
...
@@ -125,7 +125,7 @@ public abstract class PagingUtils {
Page
<
E
>
page
=
new
Page
<>(
reqVo
.
getPage
(),
reqVo
.
getSize
());
Page
<
E
>
page
=
new
Page
<>(
reqVo
.
getPage
(),
reqVo
.
getSize
());
page
.
setSearchCount
(
searchCount
);
page
.
setSearchCount
(
searchCount
);
page
=
mapper
.
selectPage
(
page
,
lambdaQuery
);
page
=
mapper
.
selectPage
(
page
,
lambdaQuery
);
return
PageVo
.
ofReqVo
(
reqVo
,
page
.
getRecords
(),
Long
.
valueOf
(
page
.
getTotal
()).
intValue
());
return
PageVo
.
ofReqVo
(
reqVo
,
page
.
getRecords
(),
page
.
getTotal
());
}
}
/**
/**
...
@@ -169,7 +169,7 @@ public abstract class PagingUtils {
...
@@ -169,7 +169,7 @@ public abstract class PagingUtils {
Page
<
E
>
page
=
new
Page
<>(
reqVo
.
getPage
(),
reqVo
.
getSize
());
Page
<
E
>
page
=
new
Page
<>(
reqVo
.
getPage
(),
reqVo
.
getSize
());
page
.
setSearchCount
(
searchCount
);
page
.
setSearchCount
(
searchCount
);
page
=
mapper
.
selectPage
(
page
,
lambdaQuery
);
page
=
mapper
.
selectPage
(
page
,
lambdaQuery
);
return
PageVo
.
ofReqVo
(
reqVo
,
page
.
getRecords
(),
Long
.
valueOf
(
page
.
getTotal
()).
intValue
());
return
PageVo
.
ofReqVo
(
reqVo
,
page
.
getRecords
(),
page
.
getTotal
());
}
}
/**
/**
...
...
xxx-common-utils/src/main/java/com/zq/common/vo/PageReqVo.java
View file @
b83913ab
...
@@ -3,6 +3,7 @@ package com.zq.common.vo;
...
@@ -3,6 +3,7 @@ package com.zq.common.vo;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
/**
* 分页查询请求对象
* 分页查询请求对象
...
@@ -10,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
...
@@ -10,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
* @author wilmiam
* @author wilmiam
* @since 2021-07-09 18:13
* @since 2021-07-09 18:13
*/
*/
@Data
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
PageReqVo
{
public
class
PageReqVo
{
...
@@ -37,9 +39,6 @@ public class PageReqVo {
...
@@ -37,9 +39,6 @@ public class PageReqVo {
return
pageReqVo
;
return
pageReqVo
;
}
}
public
PageReqVo
()
{
}
@JsonIgnore
@JsonIgnore
public
int
getOffset
()
{
public
int
getOffset
()
{
return
(
getPage
()
-
1
)
*
getSize
();
return
(
getPage
()
-
1
)
*
getSize
();
...
@@ -50,32 +49,8 @@ public class PageReqVo {
...
@@ -50,32 +49,8 @@ public class PageReqVo {
return
page
>
0
?
page
:
1
;
return
page
>
0
?
page
:
1
;
}
}
public
void
setPage
(
int
page
)
{
this
.
page
=
page
;
}
public
int
getSize
()
{
public
int
getSize
()
{
return
size
>
0
?
size
:
DEFAULT_SIZE
;
return
size
>
0
?
size
:
DEFAULT_SIZE
;
}
}
public
void
setSize
(
int
size
)
{
this
.
size
=
size
;
}
public
String
getSort
()
{
return
sort
;
}
public
void
setSort
(
String
sort
)
{
this
.
sort
=
sort
;
}
public
String
getDir
()
{
return
dir
;
}
public
void
setDir
(
String
dir
)
{
this
.
dir
=
dir
;
}
}
}
\ No newline at end of file
xxx-common-utils/src/main/java/com/zq/common/vo/PageVo.java
View file @
b83913ab
...
@@ -3,6 +3,7 @@ package com.zq.common.vo;
...
@@ -3,6 +3,7 @@ package com.zq.common.vo;
import
com.fasterxml.jackson.annotation.JsonPropertyOrder
;
import
com.fasterxml.jackson.annotation.JsonPropertyOrder
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
import
java.util.List
;
...
@@ -13,6 +14,7 @@ import java.util.List;
...
@@ -13,6 +14,7 @@ import java.util.List;
* @since 2021-07-09 18:13
* @since 2021-07-09 18:13
*/
*/
@ApiModel
(
"分页查询结果"
)
@ApiModel
(
"分页查询结果"
)
@Data
@JsonPropertyOrder
({
"start"
,
"size"
,
"total"
,
"rows"
})
@JsonPropertyOrder
({
"start"
,
"size"
,
"total"
,
"rows"
})
public
class
PageVo
<
T
>
{
public
class
PageVo
<
T
>
{
...
@@ -23,12 +25,12 @@ public class PageVo<T> {
...
@@ -23,12 +25,12 @@ public class PageVo<T> {
private
int
size
;
private
int
size
;
@ApiModelProperty
(
"总记录条数"
)
@ApiModelProperty
(
"总记录条数"
)
private
int
total
;
private
long
total
;
@ApiModelProperty
(
"当前页数据"
)
@ApiModelProperty
(
"当前页数据"
)
private
List
<
T
>
rows
;
private
List
<
T
>
rows
;
public
static
<
E
>
PageVo
<
E
>
ofReqVo
(
PageReqVo
reqVo
,
List
<
E
>
rows
,
int
total
)
{
public
static
<
E
>
PageVo
<
E
>
ofReqVo
(
PageReqVo
reqVo
,
List
<
E
>
rows
,
long
total
)
{
PageVo
<
E
>
pageVo
=
new
PageVo
<>();
PageVo
<
E
>
pageVo
=
new
PageVo
<>();
pageVo
.
setSize
(
reqVo
.
getSize
());
pageVo
.
setSize
(
reqVo
.
getSize
());
pageVo
.
setStart
(
reqVo
.
getOffset
());
pageVo
.
setStart
(
reqVo
.
getOffset
());
...
@@ -37,39 +39,4 @@ public class PageVo<T> {
...
@@ -37,39 +39,4 @@ public class PageVo<T> {
return
pageVo
;
return
pageVo
;
}
}
public
PageVo
()
{
}
public
int
getStart
()
{
return
start
;
}
public
void
setStart
(
int
start
)
{
this
.
start
=
start
;
}
public
int
getSize
()
{
return
size
;
}
public
void
setSize
(
int
size
)
{
this
.
size
=
size
;
}
public
int
getTotal
()
{
return
total
;
}
public
void
setTotal
(
int
total
)
{
this
.
total
=
total
;
}
public
List
<
T
>
getRows
()
{
return
rows
;
}
public
void
setRows
(
List
<
T
>
rows
)
{
this
.
rows
=
rows
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment