This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch mp-query in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 4e11d77886042823a54fc15356c93eed4f5cee51 Author: benjobs <[email protected]> AuthorDate: Sun Jan 12 19:16:08 2025 +0800 [Improve] mybatis-plus query impovements --- .../core/mapper/FlinkApplicationConfigMapper.java | 6 ------ .../core/mapper/FlinkApplicationMapper.java | 2 -- .../console/core/mapper/FlinkClusterMapper.java | 4 ---- .../console/core/mapper/FlinkEnvMapper.java | 4 ---- .../console/core/mapper/ProjectMapper.java | 4 ---- .../core/mapper/SparkApplicationConfigMapper.java | 6 ------ .../core/mapper/SparkApplicationMapper.java | 2 -- .../console/core/mapper/YarnQueueMapper.java | 4 ---- .../console/core/service/ProjectService.java | 4 ++++ .../impl/FlinkApplicationConfigServiceImpl.java | 12 ++++++++--- .../impl/FlinkApplicationManageServiceImpl.java | 2 +- .../impl/SparkApplicationConfigServiceImpl.java | 12 ++++++++--- .../impl/SparkApplicationManageServiceImpl.java | 3 ++- .../core/service/impl/FlinkClusterServiceImpl.java | 3 ++- .../core/service/impl/FlinkEnvServiceImpl.java | 9 +++++--- .../core/service/impl/FlinkSqlServiceImpl.java | 4 ++-- .../core/service/impl/ProjectServiceImpl.java | 24 +++++++++++++++++++--- .../core/service/impl/SparkSqlServiceImpl.java | 4 ++-- .../core/service/impl/YarnQueueServiceImpl.java | 6 +++++- .../mapper/core/FlinkApplicationConfigMapper.xml | 11 ---------- .../mapper/core/FlinkApplicationMapper.xml | 5 ----- .../resources/mapper/core/FlinkClusterMapper.xml | 13 ------------ .../main/resources/mapper/core/FlinkEnvMapper.xml | 14 ------------- .../main/resources/mapper/core/ProjectMapper.xml | 12 ----------- .../mapper/core/SparkApplicationConfigMapper.xml | 11 ---------- .../mapper/core/SparkApplicationMapper.xml | 5 ----- .../main/resources/mapper/core/YarnQueueMapper.xml | 23 --------------------- 27 files changed, 63 insertions(+), 146 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..422c7be2b 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> { @@ -31,8 +29,4 @@ public interface FlinkApplicationConfigMapper extends BaseMapper<FlinkApplicatio FlinkApplicationConfig selectEffective(@Param("appId") Long appId); - 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/FlinkApplicationMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationMapper.java index ad3698dc5..8fec861be 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationMapper.java @@ -53,8 +53,6 @@ public interface FlinkApplicationMapper extends BaseMapper<FlinkApplication> { List<String> selectRecentK8sTmPodTemplates(@Param("limitSize") Integer limit); - void resetOptionState(); - List<FlinkApplication> selectAppsByProjectId(@Param("projectId") Long id); boolean existsRunningJobByClusterId(@Param("clusterId") Long clusterId); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkClusterMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkClusterMapper.java index b8758b2c0..03a6ec1d1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkClusterMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkClusterMapper.java @@ -22,8 +22,6 @@ import org.apache.streampark.console.core.entity.FlinkCluster; 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 FlinkClusterMapper extends BaseMapper<FlinkCluster> { @@ -31,6 +29,4 @@ public interface FlinkClusterMapper extends BaseMapper<FlinkCluster> { boolean existsByClusterName(@Param("clusterName") String clusterName, @Param("id") Long id); - IPage<FlinkCluster> findPage( - Page<FlinkCluster> page, @Param("cluster") FlinkCluster flinkCluster); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java index c1315404d..38fb6f6b9 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java @@ -18,13 +18,10 @@ package org.apache.streampark.console.core.mapper; import org.apache.streampark.console.core.entity.FlinkEnv; -import org.apache.streampark.console.core.entity.Project; 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 FlinkEnvMapper extends BaseMapper<FlinkEnv> { @@ -32,5 +29,4 @@ public interface FlinkEnvMapper extends BaseMapper<FlinkEnv> { void setDefault(@Param("id") Long id); - IPage<FlinkEnv> findPage(Page<Project> page, @Param("flinkEnv") FlinkEnv flinkEnv); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ProjectMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ProjectMapper.java index c61d2bb89..43da93de1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ProjectMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ProjectMapper.java @@ -29,10 +29,6 @@ import java.util.List; public interface ProjectMapper extends BaseMapper<Project> { - void updateBuildState(@Param("id") Long id, @Param("state") Integer buildState); - - void updateBuildTime(@Param("id") Long id); - IPage<Project> selectPage(Page<Project> page, @Param("project") Project project); boolean existsByTeamId(@Param("teamId") Long teamId); 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..2f3837a33 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> { @@ -31,8 +29,4 @@ public interface SparkApplicationConfigMapper extends BaseMapper<SparkApplicatio SparkApplicationConfig selectEffective(@Param("appId") Long appId); - 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/SparkApplicationMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationMapper.java index b45ad52fd..02295069d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationMapper.java @@ -52,7 +52,5 @@ public interface SparkApplicationMapper extends BaseMapper<SparkApplication> { List<String> selectRecentK8sTmPodTemplates(@Param("limitSize") Integer limit); - void resetOptionState(); - List<SparkApplication> selectAppsByProjectId(@Param("projectId") Long id); } 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/ProjectService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java index 5e1f96dd3..206c840ed 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java @@ -166,4 +166,8 @@ public interface ProjectService extends IService<Project> { GitAuthorizedErrorEnum gitCheck(Project project); List<String> getAllTags(Project project); + + void updateBuildTime(Long id); + + void updateBuildState(Long id, int state); } 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..283fc8f39 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 @@ -188,7 +188,9 @@ public class FlinkApplicationConfigServiceImpl @Override public FlinkApplicationConfig getLatest(Long appId) { - return baseMapper.selectLatest(appId); + return this.lambdaQuery().eq(FlinkApplicationConfig::getAppId, appId) + .eq(FlinkApplicationConfig::getLatest, true) + .one(); } @Override @@ -209,9 +211,13 @@ 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(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/application/impl/FlinkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java index c6987825a..90801ab90 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java @@ -152,7 +152,7 @@ public class FlinkApplicationManageServiceImpl extends ServiceImpl<FlinkApplicat @PostConstruct public void resetOptionState() { - this.baseMapper.resetOptionState(); + this.lambdaUpdate().set(FlinkApplication::getOptionState, OptionStateEnum.NONE.getValue()).update(); } @Override 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..39b1c6e5a 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 @@ -196,7 +196,9 @@ public class SparkApplicationConfigServiceImpl @Override public SparkApplicationConfig getLatest(Long appId) { - return baseMapper.selectLatest(appId); + return this.lambdaQuery().eq(SparkApplicationConfig::getAppId, appId) + .eq(SparkApplicationConfig::getLatest, true) + .one(); } @Override @@ -217,9 +219,13 @@ 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/application/impl/SparkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java index 38c2c2a9a..55b894bde 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java @@ -124,7 +124,8 @@ public class SparkApplicationManageServiceImpl @PostConstruct public void resetOptionState() { - this.baseMapper.resetOptionState(); + this.lambdaUpdate().set(SparkApplication::getOptionState, OptionStateEnum.NONE.getValue()) + .update(); } @Override diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java index 11dba77ee..0d95296db 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java @@ -329,7 +329,8 @@ public class FlinkClusterServiceImpl extends ServiceImpl<FlinkClusterMapper, Fli @Override public IPage<FlinkCluster> findPage(FlinkCluster flinkCluster, RestRequest restRequest) { Page<FlinkCluster> page = MybatisPager.getPage(restRequest); - return this.baseMapper.findPage(page, flinkCluster); + return this.lambdaQuery().like(StringUtils.isNotBlank(flinkCluster.getClusterName()), + FlinkCluster::getClusterName, flinkCluster.getClusterName()).page(page); } @Override diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java index d422a81be..2076fb420 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java @@ -21,13 +21,14 @@ 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.entity.FlinkEnv; -import org.apache.streampark.console.core.entity.Project; import org.apache.streampark.console.core.enums.FlinkEnvCheckEnum; import org.apache.streampark.console.core.mapper.FlinkEnvMapper; import org.apache.streampark.console.core.service.FlinkClusterService; import org.apache.streampark.console.core.service.FlinkEnvService; import org.apache.streampark.console.core.service.application.FlinkApplicationInfoService; +import org.apache.commons.lang3.StringUtils; + import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -161,8 +162,10 @@ public class FlinkEnvServiceImpl extends ServiceImpl<FlinkEnvMapper, FlinkEnv> } @Override public IPage<FlinkEnv> findPage(FlinkEnv flinkEnv, RestRequest restRequest) { - Page<Project> page = MybatisPager.getPage(restRequest); - return this.baseMapper.findPage(page, flinkEnv); + Page<FlinkEnv> page = MybatisPager.getPage(restRequest); + return this.lambdaQuery() + .like(StringUtils.isNotBlank(flinkEnv.getFlinkName()), FlinkEnv::getFlinkName, flinkEnv.getFlinkName()) + .page(page); } private void checkOrElseAlert(FlinkEnv flinkEnv) { 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..b45c8a951 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,9 @@ 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/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java index 47bd24f4a..6e79f37ee 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 @@ -217,15 +217,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> "The number of running Build projects exceeds the maximum number: %d of max-build-num", maxProjectBuildNum)); Project project = getById(id); - this.baseMapper.updateBuildState(project.getId(), BuildStateEnum.BUILDING.get()); + + this.updateBuildState(project.getId(), BuildStateEnum.BUILDING.get()); + String logPath = getBuildLogPath(id); ProjectBuildTask projectBuildTask = new ProjectBuildTask( logPath, project, buildStateEnum -> { - baseMapper.updateBuildState(id, buildStateEnum.get()); + this.updateBuildState(id, buildStateEnum.get()); if (buildStateEnum == BuildStateEnum.SUCCESSFUL) { - baseMapper.updateBuildTime(id); + this.updateBuildTime(id); } flinkAppHttpWatcher.init(); }, @@ -445,6 +447,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> } } + @Override + public void updateBuildTime(Long id) { + this.lambdaUpdate() + .eq(Project::getId, id) + .set(Project::getLastBuild, new Date()) + .update(); + } + + @Override + public void updateBuildState(Long id, int state) { + this.lambdaUpdate() + .eq(Project::getId, id) + .set(Project::getBuildState, state) + .update(); + } + private Project remakeProject(Project project) { if (Objects.nonNull(project.getId())) { return this.baseMapper.selectById(project.getId()); 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..e776b73d9 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,9 @@ 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..4cbb9b961 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 @@ -78,8 +78,12 @@ public class YarnQueueServiceImpl extends ServiceImpl<YarnQueueMapper, YarnQueue AssertUtils.notNull(yarnQueue, "Yarn queue query params mustn't be null."); 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..06365d4a0 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 @@ -19,13 +19,6 @@ <mapper namespace="org.apache.streampark.console.core.mapper.FlinkApplicationConfigMapper"> - <select id="selectLatest" resultType="org.apache.streampark.console.core.entity.FlinkApplicationConfig" parameterType="java.lang.Long"> - select * - from t_flink_config - where app_id=#{appId} - and latest=true - </select> - <select id="selectLastVersion" resultType="java.lang.Integer" parameterType="java.lang.Long"> select max(`version`) as lastVersion from t_flink_config @@ -41,9 +34,5 @@ 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/FlinkApplicationMapper.xml b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkApplicationMapper.xml index 045d6b112..f0212d972 100644 --- a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkApplicationMapper.xml +++ b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkApplicationMapper.xml @@ -18,11 +18,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.FlinkApplicationMapper"> - <update id="resetOptionState"> - update t_flink_app - set option_state = 0 - </update> - <select id="existsRunningJobByClusterId" resultType="java.lang.Boolean" parameterType="java.lang.Long"> select CASE diff --git a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml index ade85d8cf..e351e6dd4 100644 --- a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml +++ b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml @@ -17,19 +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.FlinkClusterMapper"> - <select id="findPage" resultType="org.apache.streampark.console.core.entity.FlinkCluster"> - select * from t_flink_cluster - <where> - <if test="cluster.clusterName != null and cluster.clusterName != ''"> - <if test="_databaseId == 'mysql'"> - and cluster_name like concat('%', #{cluster.clusterName},'%') - </if> - <if test="_databaseId == 'pgsql'"> - and cluster_name like '%' || #{cluster.clusterName} || '%' - </if> - </if> - </where> - </select> <select id="existsByClusterId" resultType="java.lang.Boolean" parameterType="java.lang.String"> select diff --git a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkEnvMapper.xml b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkEnvMapper.xml index 7757311b8..306d1e1f7 100644 --- a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkEnvMapper.xml +++ b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkEnvMapper.xml @@ -17,20 +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.FlinkEnvMapper"> - <select id="findPage" resultType="org.apache.streampark.console.core.entity.FlinkEnv"> - select * from t_flink_env - <where> - <if test="flinkEnv.flinkName != null and flinkEnv.flinkName != ''"> - <if test="_databaseId == 'mysql'"> - and flink_name like concat('%', #{flinkEnv.flinkName},'%') - </if> - <if test="_databaseId == 'pgsql'"> - and flink_name like '%' || #{flinkEnv.flinkName} || '%' - </if> - </if> - </where> - </select> - <select id="selectByAppId" resultType="org.apache.streampark.console.core.entity.FlinkEnv" parameterType="java.lang.Long"> select v.* from t_flink_env v diff --git a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ProjectMapper.xml b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ProjectMapper.xml index ade3437a8..577ed9c29 100644 --- a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ProjectMapper.xml +++ b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ProjectMapper.xml @@ -44,18 +44,6 @@ where team_id = #{teamId} </select> - <update id="updateBuildState" parameterType="java.util.Map"> - update t_flink_project - set build_state = #{state} - where id = #{id} - </update> - - <update id="updateBuildTime" parameterType="java.lang.Long"> - update t_flink_project - set last_build = now() - where id = #{id} - </update> - <select id="selectPage" resultType="org.apache.streampark.console.core.entity.Project" parameterType="org.apache.streampark.console.core.entity.Project"> select * from t_flink_project t 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..3ddde3d4e 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 @@ -18,12 +18,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.SparkApplicationConfigMapper"> - <select id="selectLatest" resultType="org.apache.streampark.console.core.entity.SparkApplicationConfig" parameterType="java.lang.Long"> - select * - from t_spark_config - where app_id=#{appId} - and latest=true - </select> <select id="selectLastVersion" resultType="java.lang.Integer" parameterType="java.lang.Long"> select max(`version`) as lastVersion @@ -40,9 +34,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/SparkApplicationMapper.xml b/streampark-console/streampark-console-service/src/main/resources/mapper/core/SparkApplicationMapper.xml index 40e76f06a..b44c08bb0 100644 --- a/streampark-console/streampark-console-service/src/main/resources/mapper/core/SparkApplicationMapper.xml +++ b/streampark-console/streampark-console-service/src/main/resources/mapper/core/SparkApplicationMapper.xml @@ -17,11 +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.SparkApplicationMapper"> - <update id="resetOptionState"> - update t_spark_app - set option_state = 0 - </update> - <select id="selectAppsByProjectId" resultType="org.apache.streampark.console.core.entity.SparkApplication" parameterType="java.lang.Long"> select * from t_spark_app where project_id=#{projectId} 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..327b03abe 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,29 +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 CASE
