This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch mybatis
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/mybatis by this push:
new ac30d8f38 [Improve] mybatis-plus query page improvement
ac30d8f38 is described below
commit ac30d8f38bc48c6188e910ce420bbb1a2f458076
Author: benjobs <[email protected]>
AuthorDate: Sun Jan 12 18:36:23 2025 +0800
[Improve] mybatis-plus query page improvement
---
.../core/mapper/FlinkApplicationConfigMapper.java | 4 ----
.../core/mapper/SparkApplicationConfigMapper.java | 4 ----
.../console/core/mapper/YarnQueueMapper.java | 4 ----
.../impl/FlinkApplicationConfigServiceImpl.java | 8 ++++----
.../impl/SparkApplicationConfigServiceImpl.java | 5 +++--
.../core/service/impl/FlinkSqlServiceImpl.java | 5 +++--
.../core/service/impl/SparkSqlServiceImpl.java | 5 +++--
.../core/service/impl/YarnQueueServiceImpl.java | 6 +++++-
.../mapper/core/FlinkApplicationConfigMapper.xml | 5 -----
.../mapper/core/SparkApplicationConfigMapper.xml | 5 -----
.../main/resources/mapper/core/YarnQueueMapper.xml | 22 ----------------------
11 files changed, 18 insertions(+), 55 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationConfigMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationConfigMapper.java
index 47357c824..95a3a5f3c 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationConfigMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationConfigMapper.java
@@ -22,8 +22,6 @@ import
org.apache.streampark.console.core.entity.FlinkApplicationConfig;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
public interface FlinkApplicationConfigMapper extends
BaseMapper<FlinkApplicationConfig> {
@@ -33,6 +31,4 @@ public interface FlinkApplicationConfigMapper extends
BaseMapper<FlinkApplicatio
FlinkApplicationConfig selectLatest(@Param("appId") Long appId);
- IPage<FlinkApplicationConfig> selectPageByAppId(
-
Page<FlinkApplicationConfig> page, @Param("appId") Long appId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationConfigMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationConfigMapper.java
index 2644e7978..4ee0a86f5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationConfigMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationConfigMapper.java
@@ -22,8 +22,6 @@ import
org.apache.streampark.console.core.entity.SparkApplicationConfig;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
public interface SparkApplicationConfigMapper extends
BaseMapper<SparkApplicationConfig> {
@@ -33,6 +31,4 @@ public interface SparkApplicationConfigMapper extends
BaseMapper<SparkApplicatio
SparkApplicationConfig selectLatest(@Param("appId") Long appId);
- IPage<SparkApplicationConfig> selectPageByAppId(
-
Page<SparkApplicationConfig> page, @Param("appId") Long appId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/YarnQueueMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/YarnQueueMapper.java
index 8047f03c3..146686e84 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/YarnQueueMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/YarnQueueMapper.java
@@ -22,13 +22,9 @@ import org.apache.streampark.console.core.entity.YarnQueue;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/** Yarn queue mapper definition. */
public interface YarnQueueMapper extends BaseMapper<YarnQueue> {
- IPage<YarnQueue> selectPage(Page<YarnQueue> page, @Param("yarnQueue")
YarnQueue yarnQueue);
-
boolean existsByQueueLabel(@Param("yarnQueue") YarnQueue yarnQueue);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java
index b4b79e9f6..ca822877b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java
@@ -31,7 +31,6 @@ import
org.apache.streampark.console.core.service.FlinkEffectiveService;
import
org.apache.streampark.console.core.service.application.FlinkApplicationConfigService;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -209,9 +208,10 @@ public class FlinkApplicationConfigServiceImpl
@Override
public IPage<FlinkApplicationConfig> getPage(FlinkApplicationConfig
config, RestRequest request) {
- request.setSortField("version");
- Page<FlinkApplicationConfig> page = MybatisPager.getPage(request);
- IPage<FlinkApplicationConfig> configList =
this.baseMapper.selectPageByAppId(page, config.getAppId());
+ IPage<FlinkApplicationConfig> configList =
+ this.lambdaQuery().eq(FlinkApplicationConfig::getAppId,
config.getAppId())
+ .orderByDesc(FlinkApplicationConfig::getVersion)
+ .page(MybatisPager.getPage(request));
fillEffectiveField(config.getAppId(), configList.getRecords());
return configList;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationConfigServiceImpl.java
index a0f34601c..1fb1e5bd4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationConfigServiceImpl.java
@@ -217,9 +217,10 @@ public class SparkApplicationConfigServiceImpl
@Override
public IPage<SparkApplicationConfig> getPage(SparkApplicationConfig
config, RestRequest request) {
- request.setSortField("version");
Page<SparkApplicationConfig> page = MybatisPager.getPage(request);
- IPage<SparkApplicationConfig> configList =
this.baseMapper.selectPageByAppId(page, config.getAppId());
+ IPage<SparkApplicationConfig> configList =
+ this.lambdaQuery().eq(SparkApplicationConfig::getAppId,
config.getAppId())
+ .orderByDesc(SparkApplicationConfig::getVersion).page(page);
fillEffectiveField(config.getAppId(), configList.getRecords());
return configList;
}
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 4d3096708..68f81c35f 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
@@ -210,9 +210,10 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
@Override
public IPage<FlinkSql> getPage(Long appId, RestRequest request) {
- request.setSortField("version");
Page<FlinkSql> page = MybatisPager.getPage(request);
- IPage<FlinkSql> sqlList = this.lambdaQuery().eq(FlinkSql::getAppId,
appId).page(page);
+ IPage<FlinkSql> sqlList = this.lambdaQuery().eq(FlinkSql::getAppId,
appId)
+ .orderByDesc(FlinkSql::getVersion)
+ .page(page);
FlinkSql effectiveSql = baseMapper.getEffective(appId);
if (effectiveSql != null) {
for (FlinkSql sql : sqlList.getRecords()) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkSqlServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkSqlServiceImpl.java
index 167f6d5a8..8bc98c980 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkSqlServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkSqlServiceImpl.java
@@ -209,9 +209,10 @@ public class SparkSqlServiceImpl extends
ServiceImpl<SparkSqlMapper, SparkSql>
@Override
public IPage<SparkSql> getPage(Long appId, RestRequest request) {
- request.setSortField("version");
Page<SparkSql> page = MybatisPager.getPage(request);
- IPage<SparkSql> sqlList = this.lambdaQuery().eq(SparkSql::getAppId,
appId).page(page);
+ IPage<SparkSql> sqlList = this.lambdaQuery().eq(SparkSql::getAppId,
appId)
+ .orderByDesc(SparkSql::getVersion).page(page);
+
SparkSql effectiveSql = baseMapper.getEffective(appId);
if (effectiveSql != null) {
for (SparkSql sql : sqlList.getRecords()) {
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 0fcc3ff06..976834bcf 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
@@ -79,7 +79,11 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
AssertUtils.notNull(
yarnQueue.getTeamId(), "Team id of yarn queue query params mustn't
be null.");
Page<YarnQueue> page = MybatisPager.getPage(request);
- return this.baseMapper.selectPage(page, yarnQueue);
+ return this.lambdaQuery()
+ .eq(yarnQueue.getTeamId() != null, YarnQueue::getTeamId,
yarnQueue.getTeamId())
+ .like(StringUtils.isNotBlank(yarnQueue.getQueueLabel()),
YarnQueue::getQueueLabel,
+ yarnQueue.getQueueLabel())
+ .page(page);
}
/**
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkApplicationConfigMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkApplicationConfigMapper.xml
index fb1829b1e..e93f5b802 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkApplicationConfigMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkApplicationConfigMapper.xml
@@ -41,9 +41,4 @@
and e.target_type = 1
</select>
- <select id="selectPageByAppId"
resultType="org.apache.streampark.console.core.entity.FlinkApplicationConfig"
parameterType="java.lang.Long">
- select * from t_flink_config
- where app_id=#{appId}
- </select>
-
</mapper>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/SparkApplicationConfigMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/SparkApplicationConfigMapper.xml
index f1a5edf6d..f11e9c75c 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/SparkApplicationConfigMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/SparkApplicationConfigMapper.xml
@@ -40,9 +40,4 @@
and e.target_type = 3
</select>
- <select id="selectPageByAppId"
resultType="org.apache.streampark.console.core.entity.SparkApplicationConfig"
parameterType="java.lang.Long">
- select * from t_spark_config
- where app_id=#{appId}
- </select>
-
</mapper>
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 1c9754144..ef1216c30 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
@@ -17,28 +17,6 @@
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
<mapper namespace="org.apache.streampark.console.core.mapper.YarnQueueMapper">
- <select id="selectPage"
resultType="org.apache.streampark.console.core.entity.YarnQueue">
- select * from t_yarn_queue
- <where>
- <if test="yarnQueue.teamId != null">
- team_id = #{yarnQueue.teamId}
- </if>
- <if test="yarnQueue.queueLabel != null and yarnQueue.queueLabel !=
''">
- <if test="_databaseId == 'mysql'">
- and queue_label like concat('%',
#{yarnQueue.queueLabel},'%')
- </if>
- <if test="_databaseId == 'pgsql'">
- and queue_label like '%' || #{yarnQueue.queueLabel} || '%'
- </if>
- </if>
- <if test="yarnQueue.createTimeFrom != null and
yarnQueue.createTimeFrom !=''">
- and create_time > #{yarnQueue.createTimeFrom}
- </if>
- <if test="yarnQueue.createTimeTo!= null and yarnQueue.createTimeTo
!=''">
- and create_time < #{yarnQueue.createTimeTo}
- </if>
- </where>
- </select>
<select id="existsByQueueLabel" resultType="java.lang.Boolean"
parameterType="org.apache.streampark.console.core.entity.YarnQueue">
select
