This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new b6d85ba80 [Improve] sql check improvement (#3441)
b6d85ba80 is described below
commit b6d85ba80db297ae54cd70cfc37e2abfa1141f3e
Author: benjobs <[email protected]>
AuthorDate: Mon Jan 1 21:42:23 2024 +0800
[Improve] sql check improvement (#3441)
* [Improve] sql check improvement
* [Improve] mybatis limit query improvement
---------
Co-authored-by: benjobs <[email protected]>
---
.../console/base/domain/RestRequest.java | 4 +--
.../console/base/mybatis/pager/MybatisPager.java | 41 ++++++++++------------
.../streampark/console/core/entity/Resource.java | 4 ---
.../streampark/console/core/entity/Variable.java | 4 ---
.../streampark/console/core/entity/YarnQueue.java | 5 +--
.../service/alert/impl/AlertConfigServiceImpl.java | 2 +-
.../impl/ApplicationManageServiceImpl.java | 2 +-
.../service/impl/ApplicationBackUpServiceImpl.java | 2 +-
.../service/impl/ApplicationConfigServiceImpl.java | 5 ++-
.../service/impl/ApplicationLogServiceImpl.java | 5 ++-
.../core/service/impl/FlinkSqlServiceImpl.java | 5 ++-
.../core/service/impl/MessageServiceImpl.java | 2 +-
.../core/service/impl/ProjectServiceImpl.java | 2 +-
.../core/service/impl/ResourceServiceImpl.java | 4 +--
.../core/service/impl/SavePointServiceImpl.java | 5 ++-
.../core/service/impl/VariableServiceImpl.java | 2 +-
.../core/service/impl/YarnQueueServiceImpl.java | 5 ++-
.../streampark/console/system/entity/Member.java | 4 ---
.../streampark/console/system/entity/Role.java | 4 ---
.../streampark/console/system/entity/Team.java | 4 ---
.../streampark/console/system/entity/User.java | 4 ---
.../service/impl/AccessTokenServiceImpl.java | 2 +-
.../system/service/impl/MemberServiceImpl.java | 5 ++-
.../system/service/impl/RoleServiceImpl.java | 5 ++-
.../system/service/impl/TeamServiceImpl.java | 5 ++-
.../system/service/impl/UserServiceImpl.java | 6 ++--
.../main/resources/mapper/core/YarnQueueMapper.xml | 3 --
.../main/resources/mapper/system/MemberMapper.xml | 3 --
.../main/resources/mapper/system/RoleMapper.xml | 3 --
.../main/resources/mapper/system/TeamMapper.xml | 3 --
.../main/resources/mapper/system/UserMapper.xml | 3 --
.../console/core/service/YarnQueueServiceTest.java | 5 +--
32 files changed, 51 insertions(+), 107 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
index 753458404..589c1bfa7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
@@ -36,10 +36,10 @@ public class RestRequest implements Serializable {
private int pageNum = 1;
@Schema(example = "", description = "e.g. create_time")
- private String sortField;
+ private String sortField = Constant.DEFAULT_SORT_FIELD;
@Schema(
example = "",
allowableValues = {"asc", "desc"})
- private String sortOrder;
+ private String sortOrder = Constant.ORDER_DESC;
}
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 6d3dd0132..e8f7cc897 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
@@ -32,36 +32,31 @@ import java.util.List;
@SuppressWarnings("unchecked")
public final class MybatisPager<T> {
- public Page<T> getDefaultPage(RestRequest request) {
- return getPage(request, Constant.DEFAULT_SORT_FIELD, Constant.ORDER_DESC);
- }
+ public static <T> Page<T> getPage(RestRequest request) {
+ boolean invalid = request.getSortField().trim().split("\\s+").length > 1;
+ if (invalid) {
+ throw new IllegalArgumentException(
+ String.format("Invalid argument sortField: %s",
request.getSortField()));
+ }
+
+ if (request.getSortOrder() == null) {
+ request.setSortOrder(Constant.ORDER_DESC);
+ }
- public Page<T> getPage(RestRequest request, String defaultSort, String
defaultOrder) {
Page<T> page = new Page<>();
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
- List<OrderItem> orderItems = new ArrayList<>(0);
- if (StringUtils.isNotBlank(request.getSortField())
- && StringUtils.isNotBlank(request.getSortOrder())) {
- String sortField = WebUtils.camelToUnderscore(request.getSortField());
- if (StringUtils.equals(request.getSortOrder(), Constant.ORDER_DESC)) {
- orderItems.add(OrderItem.desc(sortField));
- } else {
- orderItems.add(OrderItem.asc(sortField));
- }
+ List<OrderItem> orderItems = new ArrayList<>(2);
+ String sortField = WebUtils.camelToUnderscore(request.getSortField());
+ if (StringUtils.equalsIgnoreCase(request.getSortOrder(),
Constant.ORDER_DESC)) {
+ orderItems.add(OrderItem.desc(sortField));
+ } else if (StringUtils.equalsIgnoreCase(request.getSortOrder(),
Constant.ORDER_ASC)) {
+ orderItems.add(OrderItem.asc(sortField));
} else {
- if (StringUtils.isNotBlank(defaultSort)) {
- if (StringUtils.equals(defaultOrder, Constant.ORDER_DESC)) {
- orderItems.add(OrderItem.desc(defaultSort));
- } else {
- orderItems.add(OrderItem.asc(defaultSort));
- }
- }
- }
- if (!orderItems.isEmpty()) {
- page.setOrders(orderItems);
+ throw new IllegalArgumentException("Invalid argument sortOrder: " +
request.getSortOrder());
}
+ page.setOrders(orderItems);
return page;
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java
index 502dfc3b9..6053ca717 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java
@@ -79,10 +79,6 @@ public class Resource implements Serializable {
private transient Date modifyTime;
- private transient String sortField;
-
- private transient String sortOrder;
-
private transient String connector;
public void setResourcePath(String resourcePath) {
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 6d4f1f9e4..35e7789a4 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(Constant.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..bb81b6684 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,7 @@ 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/alert/impl/AlertConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
index f77985ea7..ed8d17f2d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
@@ -55,7 +55,7 @@ public class AlertConfigServiceImpl extends
ServiceImpl<AlertConfigMapper, Alert
LambdaQueryWrapper<AlertConfig> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(params.getUserId() != null, AlertConfig::getUserId,
params.getUserId());
- Page<AlertConfig> page = new
MybatisPager<AlertConfig>().getDefaultPage(request);
+ Page<AlertConfig> page = MybatisPager.getPage(request);
IPage<AlertConfig> resultPage = getBaseMapper().selectPage(page, wrapper);
Page<AlertConfigParams> result = new Page<>();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java
index 992ece634..61807c930 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java
@@ -245,7 +245,7 @@ public class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
if (appParam.getTeamId() == null) {
return null;
}
- Page<Application> page = new
MybatisPager<Application>().getDefaultPage(request);
+ Page<Application> page = MybatisPager.getPage(request);
if (ArrayUtils.isNotEmpty(appParam.getStateArray())
&& Arrays.stream(appParam.getStateArray())
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
index b2b02a6a4..1888226cf 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
@@ -63,7 +63,7 @@ public class ApplicationBackUpServiceImpl
@Override
public IPage<ApplicationBackUp> getPage(ApplicationBackUp bakParam,
RestRequest request) {
- Page<ApplicationBackUp> page = new
MybatisPager<ApplicationBackUp>().getDefaultPage(request);
+ Page<ApplicationBackUp> page = MybatisPager.getPage(request);
LambdaQueryWrapper<ApplicationBackUp> queryWrapper =
new LambdaQueryWrapper<ApplicationBackUp>()
.eq(ApplicationBackUp::getAppId, bakParam.getAppId());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java
index 8d86d1c03..b711e8d0f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java
@@ -19,7 +19,6 @@ package org.apache.streampark.console.core.service.impl;
import org.apache.streampark.common.util.DeflaterUtils;
import org.apache.streampark.common.util.Utils;
-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;
@@ -203,8 +202,8 @@ public class ApplicationConfigServiceImpl
@Override
public IPage<ApplicationConfig> getPage(ApplicationConfig config,
RestRequest request) {
- Page<ApplicationConfig> page =
- new MybatisPager<ApplicationConfig>().getPage(request, "version",
Constant.ORDER_DESC);
+ request.setSortField("version");
+ Page<ApplicationConfig> page = MybatisPager.getPage(request);
IPage<ApplicationConfig> configList =
this.baseMapper.selectPageByAppId(page, config.getAppId());
fillEffectiveField(config.getAppId(), configList.getRecords());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java
index fd391386d..b892a8f8f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java
@@ -17,7 +17,6 @@
package org.apache.streampark.console.core.service.impl;
-import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.core.entity.ApplicationLog;
@@ -41,8 +40,8 @@ public class ApplicationLogServiceImpl extends
ServiceImpl<ApplicationLogMapper,
@Override
public IPage<ApplicationLog> getPage(ApplicationLog applicationLog,
RestRequest request) {
- Page<ApplicationLog> page =
- new MybatisPager<ApplicationLog>().getPage(request, "option_time",
Constant.ORDER_DESC);
+ request.setSortField("option_time");
+ Page<ApplicationLog> page = MybatisPager.getPage(request);
LambdaQueryWrapper<ApplicationLog> queryWrapper =
new LambdaQueryWrapper<ApplicationLog>()
.eq(ApplicationLog::getAppId, applicationLog.getAppId());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
index 1ba178188..69c175307 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
@@ -20,7 +20,6 @@ package org.apache.streampark.console.core.service.impl;
import org.apache.streampark.common.util.DeflaterUtils;
import org.apache.streampark.common.util.ExceptionUtils;
import org.apache.streampark.common.util.Utils;
-import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.core.entity.Application;
@@ -216,8 +215,8 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
@Override
public IPage<FlinkSql> getPage(Long appId, RestRequest request) {
- Page<FlinkSql> page =
- new MybatisPager<FlinkSql>().getPage(request, "version",
Constant.ORDER_DESC);
+ request.setSortField("version");
+ Page<FlinkSql> page = MybatisPager.getPage(request);
LambdaQueryWrapper<FlinkSql> queryWrapper =
new LambdaQueryWrapper<FlinkSql>().eq(FlinkSql::getAppId, appId);
IPage<FlinkSql> sqlList = this.baseMapper.selectPage(page, queryWrapper);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
index 3fa977f44..caf0c4ae3 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
@@ -48,7 +48,7 @@ public class MessageServiceImpl extends
ServiceImpl<MessageMapper, Message>
@Override
public IPage<Message> getUnReadPage(NoticeTypeEnum noticeTypeEnum,
RestRequest request) {
- Page<Message> page = new MybatisPager<Message>().getDefaultPage(request);
+ Page<Message> page = MybatisPager.getPage(request);
LambdaQueryWrapper<Message> queryWrapper =
new LambdaQueryWrapper<Message>()
.eq(Message::getIsRead, false)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
index b8abe3fc7..647087680 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -169,7 +169,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
@Override
public IPage<Project> getPage(Project project, RestRequest request) {
- Page<Project> page = new MybatisPager<Project>().getDefaultPage(request);
+ Page<Project> page = MybatisPager.getPage(request);
return this.baseMapper.selectPage(page, project);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
index b8df85f2b..6185be20a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
@@ -101,11 +101,11 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
@Autowired private FlinkSqlService flinkSqlService;
@Override
- public IPage<Resource> getPage(Resource resource, RestRequest restRequest) {
+ public IPage<Resource> getPage(Resource resource, RestRequest request) {
if (resource.getTeamId() == null) {
return null;
}
- Page<Resource> page = new
MybatisPager<Resource>().getDefaultPage(restRequest);
+ Page<Resource> page = MybatisPager.getPage(request);
return this.baseMapper.selectPage(page, resource);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
index 87052ad8f..7b303f0a7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
@@ -21,7 +21,6 @@ import org.apache.streampark.common.enums.FlinkExecutionMode;
import org.apache.streampark.common.util.CompletableFutureUtils;
import org.apache.streampark.common.util.ExceptionUtils;
import org.apache.streampark.common.util.Utils;
-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.exception.InternalException;
@@ -205,8 +204,8 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
@Override
public IPage<SavePoint> getPage(SavePoint savePoint, RestRequest request) {
- Page<SavePoint> page =
- new MybatisPager<SavePoint>().getPage(request, "trigger_time",
Constant.ORDER_DESC);
+ request.setSortField("trigger_time");
+ Page<SavePoint> page = MybatisPager.getPage(request);
LambdaQueryWrapper<SavePoint> queryWrapper =
new LambdaQueryWrapper<SavePoint>().eq(SavePoint::getAppId,
savePoint.getAppId());
return this.page(page, queryWrapper);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
index 68c35a88a..928f79fa5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
@@ -94,7 +94,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
if (variable.getTeamId() == null) {
return null;
}
- Page<Variable> page = new MybatisPager<Variable>().getDefaultPage(request);
+ Page<Variable> page = MybatisPager.getPage(request);
return this.baseMapper.selectPage(page, variable);
}
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 65de1047b..98606541b 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.FlinkExecutionMode;
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;
@@ -75,9 +76,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
Utils.requireNotNull(yarnQueue, "Yarn queue query params mustn't be
null.");
Utils.requireNotNull(
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 = MybatisPager.getPage(request);
return this.baseMapper.selectPage(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 6c85a3b96..5ea89f91b 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 ed412d340..8687a4f9a 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 8d7bca18e..bcd97e18b 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 1699e0b6e..33b257045 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/AccessTokenServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
index 4adc4544e..b87656fc5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
@@ -83,7 +83,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
@Override
public IPage<AccessToken> getPage(AccessToken tokenParam, RestRequest
request) {
- Page<AccessToken> page = new
MybatisPager<AccessToken>().getDefaultPage(request);
+ Page<AccessToken> page = MybatisPager.getPage(request);
this.baseMapper.selectPage(page, tokenParam);
List<AccessToken> records = page.getRecords();
page.setRecords(records);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
index 7b64e572c..c6634732a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.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.system.entity.Member;
import org.apache.streampark.console.system.entity.Team;
import org.apache.streampark.console.system.entity.User;
@@ -76,9 +77,7 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
@Override
public IPage<Member> getPage(Member member, RestRequest request) {
ApiAlertException.throwIfNull(member.getTeamId(), "The team id is
required.");
- Page<Member> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<Member> page = MybatisPager.getPage(request);
return baseMapper.selectPage(page, member);
}
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 57ba2be77..943b2345e 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;
@@ -60,9 +61,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@Override
public IPage<Role> getPage(Role role, RestRequest request) {
- Page<Role> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<Role> page = MybatisPager.getPage(request);
return this.baseMapper.selectPage(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 8ae8717ac..263eb162c 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.UserTypeEnum;
import org.apache.streampark.console.core.service.CommonService;
import org.apache.streampark.console.core.service.ProjectService;
@@ -64,9 +65,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
@Override
public IPage<Team> getPage(Team team, RestRequest request) {
- Page<Team> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<Team> page = MybatisPager.getPage(request);
return this.baseMapper.selectPage(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 18380e7ab..c638d16e4 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
@@ -23,6 +23,7 @@ import org.apache.streampark.console.base.domain.ResponseCode;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.base.properties.ShiroProperties;
import org.apache.streampark.console.base.util.ShaHashUtils;
import org.apache.streampark.console.base.util.WebUtils;
@@ -90,11 +91,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,
User> implements Us
@Override
public IPage<User> getPage(User user, RestRequest request) {
- Page<User> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<User> page = MybatisPager.getPage(request);
IPage<User> resPage = this.baseMapper.selectPage(page, user);
-
Utils.requireNotNull(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 4d941bb7d..5063c1a0f 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 f3f1efdbc..eb060fbd2 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="selectUsersNotInTeam"
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 bd250e83e..ada6a327f 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 f18606379..38d1c4a27 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="selectTeamsByUserId"
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 71baa0822..a4f2c0a44 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="selectNoTokenUsers"
resultType="org.apache.streampark.console.system.entity.User"
parameterType="org.apache.streampark.console.system.entity.User">
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java
index 2d2abe184..aba0586f5 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java
@@ -81,12 +81,13 @@ class YarnQueueServiceTest extends SpringUnitTestBase {
// Test for 1st page, size = 2, order by create time desc
YarnQueue queryParams = new YarnQueue();
queryParams.setTeamId(targetTeamId);
- queryParams.setSortField("create_time");
- queryParams.setSortOrder("desc");
+
queryParams.setTeamId(targetTeamId);
RestRequest request = new RestRequest();
request.setPageSize(2);
request.setPageNum(1);
+ request.setSortField("create_time");
+ request.setSortOrder("desc");
IPage<YarnQueue> yarnQueues = yarnQueueService.getPage(queryParams,
request);
assertThat(
yarnQueues.getRecords().stream()
