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 8fec861bee..3338b090ca 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 @@ -37,8 +37,6 @@ public interface FlinkApplicationMapper extends BaseMapper { List selectAppsByTeamId(@Param("teamId") Long teamId); - boolean mapping(@Param("app") FlinkApplication appParam); - List selectRecentK8sNamespaces(@Param("limitSize") Integer limit); List selectRecentK8sClusterIds( @@ -53,10 +51,6 @@ List selectRecentK8sClusterIds( List selectRecentK8sTmPodTemplates(@Param("limitSize") Integer limit); - List selectAppsByProjectId(@Param("projectId") Long id); - - boolean existsRunningJobByClusterId(@Param("clusterId") Long clusterId); - Integer countAffectedByClusterId( @Param("clusterId") Long clusterId, @Param("dbType") String dbType); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkCatalogMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkCatalogMapper.java index 1706766c19..94183ede7b 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkCatalogMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkCatalogMapper.java @@ -19,18 +19,9 @@ import org.apache.streampark.console.core.entity.FlinkCatalog; -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; /** catalog mapper */ public interface FlinkCatalogMapper extends BaseMapper { - boolean existsByCatalogName(@Param("catalogName") String catalogName); - - FlinkCatalog selectByCatalogName(@Param("catalogName") String catalogName); - - IPage selectPage(Page page, @Param("catalog") FlinkCatalog catalog); } 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 03a6ec1d16..b2cb088bdc 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 @@ -19,14 +19,8 @@ import org.apache.streampark.console.core.entity.FlinkCluster; -import org.apache.ibatis.annotations.Param; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface FlinkClusterMapper extends BaseMapper { - boolean existsByClusterId(@Param("clusterId") String clusterId, @Param("id") Long id); - - boolean existsByClusterName(@Param("clusterName") String clusterName, @Param("id") Long id); - } 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 43da93de15..54ba612623 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 @@ -25,15 +25,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.List; - public interface ProjectMapper extends BaseMapper { IPage selectPage(Page page, @Param("project") Project project); - boolean existsByTeamId(@Param("teamId") Long teamId); - - List selectProjectsByTeamId(@Param("teamId") Long teamId); - - Long getBuildingCount(); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ResourceMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ResourceMapper.java index 7906a48881..3bc5ff8d12 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ResourceMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ResourceMapper.java @@ -28,6 +28,4 @@ public interface ResourceMapper extends BaseMapper { IPage selectPage(Page page, @Param("resource") Resource resource); - - boolean existsByUserId(@Param("userId") Long userId); } 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 02295069d9..a19ecc5415 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 @@ -38,19 +38,8 @@ IPage selectPage( void persistMetrics(@Param("app") SparkApplication application); - boolean mapping(@Param("app") SparkApplication appParam); - List selectRecentK8sNamespaces(@Param("limitSize") Integer limit); - List selectRecentK8sClusterIds( - @Param("deployMode") Integer deployMode, - @Param("limitSize") Integer limit); - List selectRecentK8sPodTemplates(@Param("limitSize") Integer limit); - List selectRecentK8sJmPodTemplates(@Param("limitSize") Integer limit); - - List selectRecentK8sTmPodTemplates(@Param("limitSize") Integer limit); - - List selectAppsByProjectId(@Param("projectId") Long id); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/VariableMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/VariableMapper.java index dbb8d8e8a2..ce0194ec32 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/VariableMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/VariableMapper.java @@ -25,13 +25,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.List; - public interface VariableMapper extends BaseMapper { IPage selectPage(Page page, @Param("variable") Variable variable); - List selectVarsByTeamId(@Param("teamId") Long teamId, @Param("keyword") String keyword); - - boolean existsByTeamId(@Param("teamId") Long teamId); } 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 146686e843..72b6bca2d0 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 @@ -19,12 +19,8 @@ import org.apache.streampark.console.core.entity.YarnQueue; -import org.apache.ibatis.annotations.Param; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** Yarn queue mapper definition. */ public interface YarnQueueMapper extends BaseMapper { - - 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/FlinkApplicationInfoServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationInfoServiceImpl.java index d602eb7f4e..7276bcde10 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationInfoServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationInfoServiceImpl.java @@ -260,12 +260,16 @@ public boolean existsByUserId(Long userId) { @Override public boolean existsRunningByClusterId(Long clusterId) { - return baseMapper.existsRunningJobByClusterId(clusterId) - || FlinkAppHttpWatcher.getWatchingApps().stream() - .anyMatch( - application -> clusterId.equals(application.getFlinkClusterId()) - && FlinkAppStateEnum.RUNNING == application - .getStateEnum()); + boolean exists = this.lambdaQuery() + .eq(FlinkApplication::getFlinkClusterId, clusterId) + .eq(FlinkApplication::getState, FlinkAppStateEnum.RUNNING.getValue()) + .exists(); + + return exists || FlinkAppHttpWatcher.getWatchingApps().stream() + .anyMatch( + application -> clusterId.equals(application.getFlinkClusterId()) + && FlinkAppStateEnum.RUNNING == application + .getStateEnum()); } @Override 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 90801ab90d..aec454bace 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 @@ -179,7 +179,15 @@ public void persistMetrics(FlinkApplication appParam) { @Override public boolean mapping(FlinkApplication appParam) { - boolean mapping = this.baseMapper.mapping(appParam); + boolean result = this.lambdaUpdate() + .eq(FlinkApplication::getId, appParam.getId()) + .set(appParam.getClusterId() != null, FlinkApplication::getClusterId, appParam.getClusterId()) + .set(appParam.getJobId() != null, FlinkApplication::getJobId, appParam.getJobId()) + .set(FlinkApplication::getEndTime, null) + .set(FlinkApplication::getState, FlinkAppStateEnum.MAPPING.getValue()) + .set(FlinkApplication::getTracking, 1) + .update(); + FlinkApplication application = getById(appParam.getId()); if (application.isKubernetesModeJob()) { // todo mark @@ -187,7 +195,7 @@ public boolean mapping(FlinkApplication appParam) { } else { FlinkAppHttpWatcher.doWatching(application); } - return mapping; + return result; } @Override @@ -674,7 +682,7 @@ public void updateRelease(FlinkApplication appParam) { @Override public List listByProjectId(Long id) { - return baseMapper.selectAppsByProjectId(id); + return this.lambdaQuery().eq(FlinkApplication::getProjectId, id).list(); } @Override 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 55b894bdee..1974aee269 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 @@ -152,7 +152,13 @@ public void persistMetrics(SparkApplication appParam) { @Override public boolean mapping(SparkApplication appParam) { - return this.baseMapper.mapping(appParam); + this.lambdaUpdate() + .set(SparkApplication::getClusterId, appParam.getClusterId()) + .set(SparkApplication::getEndTime, null) + .set(SparkApplication::getState, SparkAppStateEnum.MAPPING.getValue()) + .set(SparkApplication::getTracking, 1) + .eq(SparkApplication::getId, appParam.getId()) + .update(); } @Override @@ -566,7 +572,7 @@ public void updateRelease(SparkApplication appParam) { @Override public List listByProjectId(Long id) { - return baseMapper.selectAppsByProjectId(id); + return this.lambdaQuery().eq(SparkApplication::getProjectId, id).list(); } @Override diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkCatalogServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkCatalogServiceImpl.java index f316d54787..3c0dfec4a1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkCatalogServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkCatalogServiceImpl.java @@ -26,6 +26,8 @@ import org.apache.streampark.console.core.mapper.FlinkCatalogMapper; import org.apache.streampark.console.core.service.FlinkCatalogService; +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; @@ -79,7 +81,14 @@ public IPage page(FlinkCatalogParams catalog, RestRequest re catalog.getTeamId(), "The teamId can't be null. List catalog failed."); Page page = MybatisPager.getPage(request); - this.baseMapper.selectPage(page, FlinkCatalog.of(catalog)); + + this.lambdaQuery() + .eq(FlinkCatalog::getTeamId, catalog.getTeamId()) + .eq(StringUtils.isNotBlank(catalog.getCatalogName()), FlinkCatalog::getCatalogName, + catalog.getCatalogName()) + .eq(catalog.getUserId() != null, FlinkCatalog::getUserId, catalog.getUserId()) + .page(page); + Page paramsPage = new Page<>(); BeanUtils.copyProperties(page, paramsPage, "records"); List paramList = new ArrayList<>(); @@ -99,7 +108,7 @@ public FlinkCatalog getCatalog(Long catalogId) { @Override public FlinkCatalog getCatalog(String catalogName) { - return this.baseMapper.selectByCatalogName(catalogName); + return this.lambdaQuery().eq(FlinkCatalog::getCatalogName, catalogName).one(); } @Override @@ -123,7 +132,9 @@ public boolean update(FlinkCatalogParams catalogParam, Long userId) { } public Boolean existsByCatalogName(String catalogName) { - return this.baseMapper.existsByCatalogName(catalogName); + return this.lambdaQuery() + .eq(FlinkCatalog::getCatalogName, catalogName) + .exists(); } /** validate catalog name */ 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 0d95296dbd..0450baba35 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 @@ -277,12 +277,18 @@ public Boolean allowShutdownCluster(FlinkCluster cluster) { @Override public Boolean existsByClusterId(String clusterId, Long id) { - return this.baseMapper.existsByClusterId(clusterId, id); + return this.lambdaQuery() + .eq(FlinkCluster::getClusterId, clusterId) + .ne(id != null, FlinkCluster::getId, id) + .exists(); } @Override public Boolean existsByClusterName(String clusterName, Long id) { - return this.baseMapper.existsByClusterName(clusterName, id); + return this.lambdaQuery() + .eq(FlinkCluster::getClusterName, clusterName) + .ne(id != null, FlinkCluster::getId, id) + .exists(); } @Override 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 6e79f37eee..b8aad49d35 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 @@ -44,6 +44,7 @@ import org.apache.streampark.console.core.task.ProjectBuildTask; import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; +import org.apache.commons.lang3.StringUtils; import org.apache.flink.configuration.MemorySize; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -195,22 +196,34 @@ public boolean removeById(Long id) { @Override public IPage getPage(Project project, RestRequest request) { Page page = MybatisPager.getPage(request); - return this.baseMapper.selectPage(page, project); + this.lambdaQuery() + .eq(Project::getTeamId, project.getTeamId()) + .like(StringUtils.isNotBlank(project.getName()), Project::getName, project.getName()) + .eq(project.getBuildState() != null, Project::getBuildState, project.getBuildState()) + .page(page); + return page; } @Override public Boolean existsByTeamId(Long teamId) { - return this.baseMapper.existsByTeamId(teamId); + return this.lambdaQuery() + .eq(Project::getTeamId, teamId) + .exists(); } @Override public List listByTeamId(Long teamId) { - return this.baseMapper.selectProjectsByTeamId(teamId); + return this.lambdaQuery().eq(Project::getTeamId, teamId) + .list(); } @Override public void build(Long id) throws Exception { - Long currentBuildCount = this.baseMapper.getBuildingCount(); + + Long currentBuildCount = this.lambdaQuery() + .eq(Project::getBuildState, BuildStateEnum.BUILDING.get()) + .count(); + ApiAlertException.throwIfTrue( maxProjectBuildNum > -1 && currentBuildCount > maxProjectBuildNum, String.format( 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 4cfe800939..b0139f7d66 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 @@ -123,7 +123,8 @@ public IPage getPage(Resource resource, RestRequest request) { */ @Override public boolean existsByUserId(Long userId) { - return this.baseMapper.existsByUserId(userId); + return this.lambdaQuery().eq(Resource::getCreatorId, userId) + .exists(); } @Override 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 be0ff0bad6..ee9695a83d 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 @@ -169,7 +169,11 @@ public List listByTeamId(Long teamId) { */ @Override public List listByTeamId(Long teamId, String keyword) { - return baseMapper.selectVarsByTeamId(teamId, keyword); + return this.lambdaQuery().eq(Variable::getTeamId, teamId) + .and(StringUtils.isNotBlank(keyword), c -> c.like(Variable::getVariableCode, keyword) + .or() + .like(Variable::getDescription, keyword)) + .list(); } /** @@ -255,6 +259,7 @@ private String getCodeFromPlaceholder(String placeholder) { @Override public boolean existsByTeamId(Long teamId) { - return this.baseMapper.existsByTeamId(teamId); + return this.lambdaQuery().eq(Variable::getTeamId, teamId) + .exists(); } } 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 4cbb9b9617..0c8b8f2e1d 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 @@ -112,7 +112,10 @@ public ResponseResult checkYarnQueue(YarnQueue yarnQueue) { return responseResult; } - boolean existed = this.baseMapper.existsByQueueLabel(yarnQueue); + boolean existed = this.lambdaQuery().eq(YarnQueue::getTeamId, yarnQueue.getTeamId()) + .eq(YarnQueue::getQueueLabel, yarnQueue.getQueueLabel()) + .ne(YarnQueue::getId, yarnQueue.getId()) + .exists(); if (existed) { responseResult.setStatus(1); 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 f0212d9728..0c567e6d0d 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,17 +18,6 @@ - - - - - - update t_flink_app - - - cluster_id=#{app.clusterId}, - - - job_id=#{app.jobId}, - - end_time=null, - state=14, - tracking=1 - - where id=#{app.id} - - - select - CASE - WHEN count(1) > 0 THEN true ELSE false - END - from t_flink_catalog - where catalog_name = #{catalogName} - limit 1 - - - - 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 e351e6dd49..4b0cd2aea0 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 @@ -18,34 +18,4 @@ - - - - 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 577ed9c29b..0220644bd2 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 @@ -18,52 +18,4 @@ - - - - - - - - - diff --git a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ResourceMapper.xml b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ResourceMapper.xml index af7d505436..6d0bbaa77d 100644 --- a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ResourceMapper.xml +++ b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ResourceMapper.xml @@ -43,15 +43,4 @@ - - - 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 b44c08bb03..2e7c6dd14c 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 @@ -18,10 +18,6 @@ - - - - update t_spark_app - - - cluster_id=#{app.clusterId}, - - end_time=null, - state=14, - tracking=1 - - where id=#{app.id} - - - - - - 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 327b03abed..600c883914 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,21 +17,5 @@ --> -