This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 24617e7b0 [Improve] query page improvement
24617e7b0 is described below
commit 24617e7b0722f7b627ab172b80a2b6342767fe21
Author: benjobs <[email protected]>
AuthorDate: Sun Dec 31 20:08:39 2023 +0800
[Improve] query page improvement
---
.../streampark/console/base/mybatis/pager/MybatisPager.java | 8 +++++++-
.../java/org/apache/streampark/console/core/entity/Variable.java | 4 ----
.../java/org/apache/streampark/console/core/entity/YarnQueue.java | 4 ----
.../console/core/service/impl/YarnQueueServiceImpl.java | 5 ++---
.../java/org/apache/streampark/console/system/entity/Member.java | 4 ----
.../java/org/apache/streampark/console/system/entity/Role.java | 4 ----
.../java/org/apache/streampark/console/system/entity/Team.java | 4 ----
.../java/org/apache/streampark/console/system/entity/User.java | 4 ----
.../streampark/console/system/service/impl/RoleServiceImpl.java | 5 ++---
.../streampark/console/system/service/impl/TeamServiceImpl.java | 5 ++---
.../streampark/console/system/service/impl/UserServiceImpl.java | 6 ++----
.../src/main/resources/mapper/core/YarnQueueMapper.xml | 3 ---
.../src/main/resources/mapper/system/MemberMapper.xml | 3 ---
.../src/main/resources/mapper/system/RoleMapper.xml | 3 ---
.../src/main/resources/mapper/system/TeamMapper.xml | 3 ---
.../src/main/resources/mapper/system/UserMapper.xml | 3 ---
16 files changed, 15 insertions(+), 53 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
index 4435d622f..8249d8791 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
@@ -33,7 +33,13 @@ import java.util.List;
public final class MybatisPager<T> {
public Page<T> getDefaultPage(RestRequest request) {
- return getPage(request, Constant.DEFAULT_SORT_FIELD, Constant.ORDER_DESC);
+ if (request.getSortField() == null) {
+ request.setSortField(Constant.DEFAULT_SORT_FIELD);
+ }
+ if (request.getSortOrder() == null) {
+ request.setSortField(Constant.ORDER_DESC);
+ }
+ return getPage(request, request.getSortField(), request.getSortOrder());
}
public Page<T> getPage(RestRequest request, String defaultSort, String
defaultOrder) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java
index 75571f53a..f9e225b17 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java
@@ -64,10 +64,6 @@ public class Variable implements Serializable {
private transient Date modifyTime;
- private transient String sortField;
-
- private transient String sortOrder;
-
public void dataMasking() {
if (desensitization) {
this.setVariableValue(ConfigConst.DEFAULT_DATAMASK_STRING());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/YarnQueue.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/YarnQueue.java
index 18808b3fb..f123fdafe 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/YarnQueue.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/YarnQueue.java
@@ -48,10 +48,6 @@ public class YarnQueue implements Serializable {
private Date modifyTime;
- private transient String sortField;
-
- private transient String sortOrder;
-
private transient String createTimeFrom;
private transient String createTimeTo;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
index 0b7421353..22872d118 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
@@ -21,6 +21,7 @@ import org.apache.streampark.common.enums.ExecutionMode;
import org.apache.streampark.common.util.Utils;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.core.bean.ResponseResult;
import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.entity.FlinkCluster;
@@ -74,9 +75,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
public IPage<YarnQueue> findYarnQueues(YarnQueue yarnQueue, RestRequest
request) {
Utils.notNull(yarnQueue, "Yarn queue query params mustn't be null.");
Utils.notNull(yarnQueue.getTeamId(), "Team id of yarn queue query params
mustn't be null.");
- Page<YarnQueue> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<YarnQueue> page = new
MybatisPager<YarnQueue>().getDefaultPage(request);
return this.baseMapper.findQueues(page, yarnQueue);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Member.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Member.java
index d3e7e029b..422b77a2b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Member.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Member.java
@@ -48,10 +48,6 @@ public class Member implements Serializable {
private transient String roleName;
- private transient String sortField;
-
- private transient String sortOrder;
-
private transient String createTimeFrom;
private transient String createTimeTo;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java
index 16d853b30..fc61c63e4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java
@@ -48,10 +48,6 @@ public class Role implements Serializable {
private Date modifyTime;
- private transient String sortField;
-
- private transient String sortOrder;
-
private transient String createTimeFrom;
private transient String createTimeTo;
private transient String menuId;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Team.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Team.java
index 415fb43e0..66db7b0c1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Team.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Team.java
@@ -45,10 +45,6 @@ public class Team implements Serializable {
private Date modifyTime;
- private transient String sortField;
-
- private transient String sortOrder;
-
private transient String createTimeFrom;
private transient String createTimeTo;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
index 4b3fc3375..8d22c9823 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
@@ -84,10 +84,6 @@ public class User implements Serializable {
private transient String oldPassword;
- private transient String sortField;
-
- private transient String sortOrder;
-
private transient String createTimeFrom;
private transient String createTimeTo;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
index 040e5f934..1df300099 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
@@ -20,6 +20,7 @@ package org.apache.streampark.console.system.service.impl;
import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.system.entity.Role;
import org.apache.streampark.console.system.entity.RoleMenu;
import org.apache.streampark.console.system.mapper.RoleMapper;
@@ -59,9 +60,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@Override
public IPage<Role> findRoles(Role role, RestRequest request) {
- Page<Role> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<Role> page = new MybatisPager<Role>().getDefaultPage(request);
return this.baseMapper.findRole(page, role);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
index e4899831c..deb54e2f3 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
@@ -19,6 +19,7 @@ package org.apache.streampark.console.system.service.impl;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.core.enums.UserType;
import org.apache.streampark.console.core.service.ApplicationService;
import org.apache.streampark.console.core.service.CommonService;
@@ -64,9 +65,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
@Override
public IPage<Team> findTeams(Team team, RestRequest request) {
- Page<Team> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<Team> page = new MybatisPager<Team>().getDefaultPage(request);
return this.baseMapper.findTeam(page, team);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index 61c296956..fe345e9e7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -20,6 +20,7 @@ package org.apache.streampark.console.system.service.impl;
import org.apache.streampark.common.util.Utils;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.base.util.ShaHashUtils;
import org.apache.streampark.console.system.authentication.JWTToken;
import org.apache.streampark.console.system.entity.Team;
@@ -70,11 +71,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,
User> implements Us
@Override
public IPage<User> findUserDetail(User user, RestRequest request) {
- Page<User> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<User> page = new MybatisPager<User>().getDefaultPage(request);
IPage<User> resPage = this.baseMapper.findUserDetail(page, user);
-
Utils.notNull(resPage);
if (resPage.getTotal() == 0) {
resPage.setRecords(Collections.emptyList());
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/YarnQueueMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/YarnQueueMapper.xml
index f700f9a0c..f21e1b76a 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/YarnQueueMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/YarnQueueMapper.xml
@@ -42,9 +42,6 @@
and create_time < #{yarnQueue.createTimeTo}
</if>
</where>
- <if test="yarnQueue.sortField != null and yarnQueue.sortField != ''">
- order by ${yarnQueue.sortField} ${yarnQueue.sortOrder}
- </if>
</select>
<select id="existsByQueueLabel" resultType="java.lang.Boolean"
parameterType="org.apache.streampark.console.core.entity.YarnQueue">
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
index 7e962456b..21fa87363 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
@@ -63,9 +63,6 @@
and tur.create_time < #{member.createTimeTo}
</if>
</where>
- <if test="member.sortField != null and member.sortField != ''">
- order by ${member.sortField} ${member.sortOrder}
- </if>
</select>
<select id="findUsersNotInTeam"
resultType="org.apache.streampark.console.system.entity.User">
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
index ad4800dfb..f0850066c 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
@@ -38,9 +38,6 @@
and create_time < #{role.createTimeTo}
</if>
</where>
- <if test="role.sortField != null and role.sortField != ''">
- order by ${role.sortField} ${role.sortOrder}
- </if>
</select>
</mapper>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
index 59a6a9e18..e4bd10dd3 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
@@ -38,9 +38,6 @@
and create_time < #{team.createTimeTo}
</if>
</where>
- <if test="team.sortField != null and team.sortField != ''">
- order by ${team.sortField} ${team.sortOrder}
- </if>
</select>
<select id="findUserTeams"
resultType="org.apache.streampark.console.system.entity.Team"
parameterType="org.apache.streampark.console.system.entity.Team">
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
index 33ea34216..74ff21ad6 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
@@ -53,9 +53,6 @@
and status = #{user.status}
</if>
</where>
- <if test="user.sortField != null and user.sortField != ''">
- order by ${user.sortField} ${user.sortOrder}
- </if>
</select>
<select id="getNoTokenUser"
resultType="org.apache.streampark.console.system.entity.User"
parameterType="org.apache.streampark.console.system.entity.User">
