This is an automated email from the ASF dual-hosted git repository.
panyuepeng 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 a8abc4abc [ISSUE-3064][Improve] Improve streampark-console core
package module mapper name base on [3.1 Naming Style] (#3261)
a8abc4abc is described below
commit a8abc4abcef0507656f74240213200d15032b0d2
Author: VampireAchao <[email protected]>
AuthorDate: Mon Oct 23 23:01:07 2023 +0800
[ISSUE-3064][Improve] Improve streampark-console core package module mapper
name base on [3.1 Naming Style] (#3261)
* [Improve] Improve streampark-console core package module mapper name base
on [3.1 Naming Style]
---
.../console/core/mapper/AlertConfigMapper.java | 2 +-
.../core/mapper/ApplicationConfigMapper.java | 9 +++++----
.../console/core/mapper/ApplicationMapper.java | 22 +++++++++++-----------
.../console/core/mapper/FlinkEnvMapper.java | 2 +-
.../console/core/mapper/FlinkSqlMapper.java | 2 +-
.../console/core/mapper/ProjectMapper.java | 4 ++--
.../console/core/mapper/ResourceMapper.java | 2 +-
.../console/core/mapper/VariableMapper.java | 4 ++--
.../console/core/mapper/YarnQueueMapper.java | 2 +-
.../service/alert/impl/AlertConfigServiceImpl.java | 2 +-
.../impl/ApplicationActionServiceImpl.java | 2 +-
.../impl/ApplicationInfoServiceImpl.java | 12 ++++++------
.../impl/ApplicationManageServiceImpl.java | 10 +++++-----
.../service/impl/ApplicationConfigServiceImpl.java | 9 +++++----
.../core/service/impl/FlinkEnvServiceImpl.java | 2 +-
.../core/service/impl/FlinkSqlServiceImpl.java | 2 +-
.../core/service/impl/ProjectServiceImpl.java | 4 ++--
.../core/service/impl/ResourceServiceImpl.java | 2 +-
.../core/service/impl/VariableServiceImpl.java | 4 ++--
.../core/service/impl/YarnQueueServiceImpl.java | 2 +-
.../resources/mapper/core/AlertConfigMapper.xml | 2 +-
.../mapper/core/ApplicationConfigMapper.xml | 8 ++++----
.../resources/mapper/core/ApplicationMapper.xml | 22 +++++++++++-----------
.../main/resources/mapper/core/FlinkEnvMapper.xml | 2 +-
.../main/resources/mapper/core/FlinkSqlMapper.xml | 2 +-
.../main/resources/mapper/core/ProjectMapper.xml | 4 ++--
.../main/resources/mapper/core/ResourceMapper.xml | 2 +-
.../main/resources/mapper/core/VariableMapper.xml | 4 ++--
.../main/resources/mapper/core/YarnQueueMapper.xml | 2 +-
29 files changed, 75 insertions(+), 73 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/AlertConfigMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/AlertConfigMapper.java
index 8d8ed8b5d..16acfcd49 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/AlertConfigMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/AlertConfigMapper.java
@@ -24,5 +24,5 @@ import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface AlertConfigMapper extends BaseMapper<AlertConfig> {
- AlertConfig getAlertConfByName(@Param("alertConfig") AlertConfig
alertConfig);
+ AlertConfig selectAlertConfByName(@Param("alertConfig") AlertConfig
alertConfig);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationConfigMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationConfigMapper.java
index 0070ed807..181eef83e 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationConfigMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationConfigMapper.java
@@ -27,11 +27,12 @@ import
com.baomidou.mybatisplus.extension.plugins.pagination.Page;
public interface ApplicationConfigMapper extends BaseMapper<ApplicationConfig>
{
- Integer getLastVersion(@Param("appId") Long appId);
+ Integer selectLastVersion(@Param("appId") Long appId);
- ApplicationConfig getEffective(@Param("appId") Long appId);
+ ApplicationConfig selectEffective(@Param("appId") Long appId);
- ApplicationConfig getLatest(@Param("appId") Long appId);
+ ApplicationConfig selectLatest(@Param("appId") Long appId);
- IPage<ApplicationConfig> pageByAppId(Page<ApplicationConfig> page,
@Param("appId") Long appId);
+ IPage<ApplicationConfig> selectPageByAppId(
+ Page<ApplicationConfig> page, @Param("appId") Long appId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationMapper.java
index e1eb05dda..095b240d1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationMapper.java
@@ -29,34 +29,34 @@ import java.util.List;
public interface ApplicationMapper extends BaseMapper<Application> {
- IPage<Application> page(Page<Application> page, @Param("app") Application
application);
+ IPage<Application> selectPage(Page<Application> page, @Param("app")
Application application);
- Application getApp(@Param("app") Application application);
+ Application selectApp(@Param("app") Application application);
void persistMetrics(@Param("app") Application application);
- List<Application> getByTeamId(@Param("teamId") Long teamId);
+ List<Application> selectAppsByTeamId(@Param("teamId") Long teamId);
- List<Application> getProbeApps();
+ List<Application> selectProbeApps();
boolean mapping(@Param("app") Application appParam);
- List<String> getRecentK8sNamespace(@Param("limitSize") Integer limit);
+ List<String> selectRecentK8sNamespaces(@Param("limitSize") Integer limit);
- List<String> getRecentK8sClusterId(
+ List<String> selectRecentK8sClusterIds(
@Param("executionMode") Integer executionMode, @Param("limitSize")
Integer limit);
- List<String> getRecentFlinkBaseImage(@Param("limitSize") Integer limit);
+ List<String> selectRecentFlinkBaseImages(@Param("limitSize") Integer limit);
- List<String> getRecentK8sPodTemplate(@Param("limitSize") Integer limit);
+ List<String> selectRecentK8sPodTemplates(@Param("limitSize") Integer limit);
- List<String> getRecentK8sJmPodTemplate(@Param("limitSize") Integer limit);
+ List<String> selectRecentK8sJmPodTemplates(@Param("limitSize") Integer
limit);
- List<String> getRecentK8sTmPodTemplate(@Param("limitSize") Integer limit);
+ List<String> selectRecentK8sTmPodTemplates(@Param("limitSize") Integer
limit);
void resetOptionState();
- List<Application> getByProjectId(@Param("projectId") Long id);
+ List<Application> 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/FlinkEnvMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java
index ee123c3c6..ede933a88 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
@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface FlinkEnvMapper extends BaseMapper<FlinkEnv> {
- FlinkEnv getByAppId(@Param("appId") Long appId);
+ FlinkEnv selectByAppId(@Param("appId") Long appId);
void setDefault(@Param("id") Long id);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkSqlMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkSqlMapper.java
index d4bbf4f70..791bd7b96 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkSqlMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkSqlMapper.java
@@ -31,5 +31,5 @@ public interface FlinkSqlMapper extends BaseMapper<FlinkSql> {
Integer getLatestVersion(@Param("appId") Long appId);
- List<FlinkSql> getByTeamId(@Param("teamId") Long teamId);
+ List<FlinkSql> selectSqlsByTeamId(@Param("teamId") Long teamId);
}
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 91752d5df..11f6a1ea6 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
@@ -33,9 +33,9 @@ public interface ProjectMapper extends BaseMapper<Project> {
void updateBuildTime(@Param("id") Long id);
- IPage<Project> page(Page<Project> page, @Param("project") Project project);
+ IPage<Project> selectPage(Page<Project> page, @Param("project") Project
project);
Boolean existsByTeamId(@Param("teamId") Long teamId);
- List<Project> selectByTeamId(@Param("teamId") Long teamId);
+ List<Project> selectProjectsByTeamId(@Param("teamId") Long teamId);
}
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 585b8bdf6..e4743106e 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
@@ -27,7 +27,7 @@ import
com.baomidou.mybatisplus.extension.plugins.pagination.Page;
public interface ResourceMapper extends BaseMapper<Resource> {
- IPage<Resource> page(Page<Resource> page, @Param("resource") Resource
resource);
+ IPage<Resource> selectPage(Page<Resource> 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/VariableMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/VariableMapper.java
index a7f8e93a5..f381265af 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
@@ -29,9 +29,9 @@ import java.util.List;
public interface VariableMapper extends BaseMapper<Variable> {
- IPage<Variable> page(Page<Variable> page, @Param("variable") Variable
variable);
+ IPage<Variable> selectPage(Page<Variable> page, @Param("variable") Variable
variable);
- List<Variable> selectByTeamId(@Param("teamId") Long teamId,
@Param("keyword") String keyword);
+ List<Variable> 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 5176d1b5c..b0c93a7aa 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
@@ -27,7 +27,7 @@ import
com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/** Yarn queue mapper definition. */
public interface YarnQueueMapper extends BaseMapper<YarnQueue> {
- IPage<YarnQueue> findQueues(Page<YarnQueue> page, @Param("yarnQueue")
YarnQueue 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/alert/impl/AlertConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
index 2b6c29879..828a89eeb 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
@@ -69,7 +69,7 @@ public class AlertConfigServiceImpl extends
ServiceImpl<AlertConfigMapper, Alert
@Override
public boolean exist(AlertConfig alertConfig) {
- AlertConfig confByName = this.baseMapper.getAlertConfByName(alertConfig);
+ AlertConfig confByName =
this.baseMapper.selectAlertConfByName(alertConfig);
return confByName != null;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
index ff0745284..49799d4b8 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
@@ -205,7 +205,7 @@ public class ApplicationActionServiceImpl extends
ServiceImpl<ApplicationMapper,
public void forcedStop(Application appParam) {
CompletableFuture<SubmitResponse> startFuture =
startFutureMap.remove(appParam.getId());
CompletableFuture<CancelResponse> cancelFuture =
cancelFutureMap.remove(appParam.getId());
- Application application = this.baseMapper.getApp(appParam);
+ Application application = this.baseMapper.selectApp(appParam);
if (isKubernetesApp(application)) {
KubernetesDeploymentHelper.watchPodTerminatedLog(
application.getK8sNamespace(), application.getJobName(),
application.getJobId());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
index 8b836c26c..4d4829142 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
@@ -278,32 +278,32 @@ public class ApplicationInfoServiceImpl extends
ServiceImpl<ApplicationMapper, A
@Override
public List<String> getRecentK8sNamespace() {
- return baseMapper.getRecentK8sNamespace(DEFAULT_HISTORY_RECORD_LIMIT);
+ return baseMapper.selectRecentK8sNamespaces(DEFAULT_HISTORY_RECORD_LIMIT);
}
@Override
public List<String> getRecentK8sClusterId(Integer executionMode) {
- return baseMapper.getRecentK8sClusterId(executionMode,
DEFAULT_HISTORY_RECORD_LIMIT);
+ return baseMapper.selectRecentK8sClusterIds(executionMode,
DEFAULT_HISTORY_RECORD_LIMIT);
}
@Override
public List<String> getRecentFlinkBaseImage() {
- return baseMapper.getRecentFlinkBaseImage(DEFAULT_HISTORY_RECORD_LIMIT);
+ return
baseMapper.selectRecentFlinkBaseImages(DEFAULT_HISTORY_RECORD_LIMIT);
}
@Override
public List<String> getRecentK8sPodTemplate() {
- return
baseMapper.getRecentK8sPodTemplate(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
+ return
baseMapper.selectRecentK8sPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
}
@Override
public List<String> getRecentK8sJmPodTemplate() {
- return
baseMapper.getRecentK8sJmPodTemplate(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
+ return
baseMapper.selectRecentK8sJmPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
}
@Override
public List<String> getRecentK8sTmPodTemplate() {
- return
baseMapper.getRecentK8sTmPodTemplate(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
+ return
baseMapper.selectRecentK8sTmPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
}
@Override
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 83533cc7b..cc2e7348b 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
@@ -250,7 +250,7 @@ public class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
appParam.setStateArray(newArray);
}
}
- this.baseMapper.page(page, appParam);
+ this.baseMapper.selectPage(page, appParam);
List<Application> records = page.getRecords();
long now = System.currentTimeMillis();
@@ -685,12 +685,12 @@ public class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
@Override
public List<Application> getByProjectId(Long id) {
- return baseMapper.getByProjectId(id);
+ return baseMapper.selectAppsByProjectId(id);
}
@Override
public List<Application> getByTeamId(Long teamId) {
- return baseMapper.getByTeamId(teamId);
+ return baseMapper.selectAppsByTeamId(teamId);
}
@Override
@@ -708,7 +708,7 @@ public class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
}
public List<Application> getProbeApps() {
- return this.baseMapper.getProbeApps();
+ return this.baseMapper.selectProbeApps();
}
@Override
@@ -752,7 +752,7 @@ public class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
@Override
public Application getApp(Application appParam) {
- Application application = this.baseMapper.getApp(appParam);
+ Application application = this.baseMapper.selectApp(appParam);
ApplicationConfig config = configService.getEffective(appParam.getId());
config = config == null ? configService.getLatest(appParam.getId()) :
config;
if (config != null) {
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 4c471c7b1..84ff583a6 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
@@ -82,7 +82,7 @@ public class ApplicationConfigServiceImpl
applicationConfig.setContent(config);
applicationConfig.setCreateTime(new Date());
- Integer version = this.baseMapper.getLastVersion(appParam.getId());
+ Integer version = this.baseMapper.selectLastVersion(appParam.getId());
applicationConfig.setVersion(version == null ? 1 : version + 1);
save(applicationConfig);
this.setLatestOrEffective(latest, applicationConfig.getId(),
appParam.getId());
@@ -182,12 +182,12 @@ public class ApplicationConfigServiceImpl
@Override
public ApplicationConfig getLatest(Long appId) {
- return baseMapper.getLatest(appId);
+ return baseMapper.selectLatest(appId);
}
@Override
public ApplicationConfig getEffective(Long appId) {
- return baseMapper.getEffective(appId);
+ return baseMapper.selectEffective(appId);
}
@Override
@@ -205,7 +205,8 @@ public class ApplicationConfigServiceImpl
public IPage<ApplicationConfig> page(ApplicationConfig config, RestRequest
request) {
Page<ApplicationConfig> page =
new MybatisPager<ApplicationConfig>().getPage(request, "version",
Constant.ORDER_DESC);
- IPage<ApplicationConfig> configList = this.baseMapper.pageByAppId(page,
config.getAppId());
+ IPage<ApplicationConfig> configList =
+ this.baseMapper.selectPageByAppId(page, config.getAppId());
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/FlinkEnvServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
index 87cec262e..e42432886 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
@@ -121,7 +121,7 @@ public class FlinkEnvServiceImpl extends
ServiceImpl<FlinkEnvMapper, FlinkEnv>
@Override
public FlinkEnv getByAppId(Long appId) {
- return this.baseMapper.getByAppId(appId);
+ return this.baseMapper.selectByAppId(appId);
}
@Override
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 8fb5a25d9..cf02788b1 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
@@ -211,7 +211,7 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
@Override
public List<FlinkSql> getByTeamId(Long teamId) {
- return this.baseMapper.getByTeamId(teamId);
+ return this.baseMapper.selectSqlsByTeamId(teamId);
}
@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 c4117b5fc..3eec51592 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
@@ -179,7 +179,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
@Override
public IPage<Project> page(Project project, RestRequest request) {
Page<Project> page = new MybatisPager<Project>().getDefaultPage(request);
- return this.baseMapper.page(page, project);
+ return this.baseMapper.selectPage(page, project);
}
@Override
@@ -189,7 +189,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
@Override
public List<Project> findByTeamId(Long teamId) {
- return this.baseMapper.selectByTeamId(teamId);
+ return this.baseMapper.selectProjectsByTeamId(teamId);
}
@Override
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 c1b4b4564..52abfcbb2 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
@@ -104,7 +104,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
return null;
}
Page<Resource> page = new
MybatisPager<Resource>().getDefaultPage(restRequest);
- return this.baseMapper.page(page, resource);
+ return this.baseMapper.selectPage(page, resource);
}
/**
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 711022888..eb790a8ec 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
@@ -95,7 +95,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
return null;
}
Page<Variable> page = new MybatisPager<Variable>().getDefaultPage(request);
- return this.baseMapper.page(page, variable);
+ return this.baseMapper.selectPage(page, variable);
}
@Override
@@ -170,7 +170,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
*/
@Override
public List<Variable> findByTeamId(Long teamId, String keyword) {
- return baseMapper.selectByTeamId(teamId, keyword);
+ return baseMapper.selectVarsByTeamId(teamId, keyword);
}
/**
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 e536bdbb9..e24d76b0f 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
@@ -77,7 +77,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
Page<YarnQueue> page = new Page<>();
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
- return this.baseMapper.findQueues(page, yarnQueue);
+ return this.baseMapper.selectPage(page, yarnQueue);
}
/**
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/AlertConfigMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/AlertConfigMapper.xml
index 935da7b96..8bf9d0dcd 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/AlertConfigMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/AlertConfigMapper.xml
@@ -31,7 +31,7 @@
<result column="modify_time" jdbcType="TIMESTAMP"
property="modifyTime"/>
</resultMap>
- <select id="getAlertConfByName"
resultType="org.apache.streampark.console.core.entity.AlertConfig"
parameterType="org.apache.streampark.console.core.entity.AlertConfig">
+ <select id="selectAlertConfByName"
resultType="org.apache.streampark.console.core.entity.AlertConfig"
parameterType="org.apache.streampark.console.core.entity.AlertConfig">
select id
from t_alert_config t
where t.alert_name = #{alertConfig.alertName}
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationConfigMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationConfigMapper.xml
index ede9b7472..6738e6a49 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationConfigMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationConfigMapper.xml
@@ -28,20 +28,20 @@
<result column="create_time" jdbcType="DATE" property="createTime"/>
</resultMap>
- <select id="getLatest"
resultType="org.apache.streampark.console.core.entity.ApplicationConfig"
parameterType="java.lang.Long">
+ <select id="selectLatest"
resultType="org.apache.streampark.console.core.entity.ApplicationConfig"
parameterType="java.lang.Long">
select *
from t_flink_config
where app_id=#{appId}
and latest=true
</select>
- <select id="getLastVersion" resultType="java.lang.Integer"
parameterType="java.lang.Long">
+ <select id="selectLastVersion" resultType="java.lang.Integer"
parameterType="java.lang.Long">
select max(`version`) as lastVersion
from t_flink_config
where app_id = #{appId}
</select>
- <select id="getEffective"
resultType="org.apache.streampark.console.core.entity.ApplicationConfig"
parameterType="java.lang.Long">
+ <select id="selectEffective"
resultType="org.apache.streampark.console.core.entity.ApplicationConfig"
parameterType="java.lang.Long">
select s.*
from t_flink_config s
inner join t_flink_effective e
@@ -50,7 +50,7 @@
and e.target_type = 1
</select>
- <select id="pageByAppId"
resultType="org.apache.streampark.console.core.entity.ApplicationConfig"
parameterType="java.lang.Long">
+ <select id="selectPageByAppId"
resultType="org.apache.streampark.console.core.entity.ApplicationConfig"
parameterType="java.lang.Long">
select * from t_flink_config
where app_id=#{appId}
</select>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
index 7d1b87208..f8bb9160c 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
@@ -113,11 +113,11 @@
limit 1
</select>
- <select id="getByProjectId"
resultType="org.apache.streampark.console.core.entity.Application"
parameterType="java.lang.Long">
+ <select id="selectAppsByProjectId"
resultType="org.apache.streampark.console.core.entity.Application"
parameterType="java.lang.Long">
select * from t_flink_app where project_id=#{projectId}
</select>
- <select id="page"
resultType="org.apache.streampark.console.core.entity.Application"
parameterType="org.apache.streampark.console.core.entity.Application">
+ <select id="selectPage"
resultType="org.apache.streampark.console.core.entity.Application"
parameterType="org.apache.streampark.console.core.entity.Application">
select
t.*,
p.name as projectName,
@@ -177,7 +177,7 @@
</where>
</select>
- <select id="getApp"
resultType="org.apache.streampark.console.core.entity.Application"
parameterType="org.apache.streampark.console.core.entity.Application">
+ <select id="selectApp"
resultType="org.apache.streampark.console.core.entity.Application"
parameterType="org.apache.streampark.console.core.entity.Application">
select t.*, p.name as projectName
from t_flink_app t left join t_flink_project p
on t.project_id = p.id
@@ -240,7 +240,7 @@
where id=#{app.id}
</update>
- <select id="getByTeamId"
resultType="org.apache.streampark.console.core.entity.Application"
parameterType="java.lang.Long">
+ <select id="selectAppsByTeamId"
resultType="org.apache.streampark.console.core.entity.Application"
parameterType="java.lang.Long">
select
t.*,
u.username,
@@ -255,7 +255,7 @@
where t.team_id=#{teamId}
</select>
- <select id="getProbeApps"
resultType="org.apache.streampark.console.core.entity.Application">
+ <select id="selectProbeApps"
resultType="org.apache.streampark.console.core.entity.Application">
select
t.*,
u.username,
@@ -286,7 +286,7 @@
where id=#{app.id}
</update>
- <select id="getRecentK8sNamespace" resultType="java.lang.String"
parameterType="java.lang.Integer">
+ <select id="selectRecentK8sNamespaces" resultType="java.lang.String"
parameterType="java.lang.Integer">
select k8s_namespace
from (
select k8s_namespace, max(create_time) as ct
@@ -298,7 +298,7 @@
limit #{limitSize}
</select>
- <select id="getRecentK8sClusterId" resultType="java.lang.String"
parameterType="java.util.Map">
+ <select id="selectRecentK8sClusterIds" resultType="java.lang.String"
parameterType="java.util.Map">
select cluster_id
from (
select cluster_id, max(create_time) as ct
@@ -311,7 +311,7 @@
limit #{limitSize}
</select>
- <select id="getRecentFlinkBaseImage" resultType="java.lang.String"
parameterType="java.lang.Integer">
+ <select id="selectRecentFlinkBaseImages" resultType="java.lang.String"
parameterType="java.lang.Integer">
select flink_image
from (
select flink_image, max(create_time) as ct
@@ -324,7 +324,7 @@
limit #{limitSize}
</select>
- <select id="getRecentK8sPodTemplate" resultType="java.lang.String"
parameterType="java.lang.Integer">
+ <select id="selectRecentK8sPodTemplates" resultType="java.lang.String"
parameterType="java.lang.Integer">
select k8s_pod_template
from (
select k8s_pod_template, max(create_time) as ct
@@ -338,7 +338,7 @@
limit #{limitSize}
</select>
- <select id="getRecentK8sJmPodTemplate" resultType="java.lang.String"
parameterType="java.lang.Integer">
+ <select id="selectRecentK8sJmPodTemplates" resultType="java.lang.String"
parameterType="java.lang.Integer">
select k8s_jm_pod_template
from (
select k8s_jm_pod_template, max(create_time) as ct
@@ -352,7 +352,7 @@
limit #{limitSize}
</select>
- <select id="getRecentK8sTmPodTemplate" resultType="java.lang.String"
parameterType="java.lang.Integer">
+ <select id="selectRecentK8sTmPodTemplates" resultType="java.lang.String"
parameterType="java.lang.Integer">
select k8s_tm_pod_template
from (
select k8s_tm_pod_template, max(create_time) as ct
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 160c9d97b..ccdcbf808 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
@@ -29,7 +29,7 @@
<result column="create_time" jdbcType="DATE" property="createTime"/>
</resultMap>
- <select id="getByAppId"
resultType="org.apache.streampark.console.core.entity.FlinkEnv"
parameterType="java.lang.Long">
+ <select id="selectByAppId"
resultType="org.apache.streampark.console.core.entity.FlinkEnv"
parameterType="java.lang.Long">
select v.*
from t_flink_env v
inner join (
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkSqlMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkSqlMapper.xml
index ad267c797..41d3b37bb 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkSqlMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkSqlMapper.xml
@@ -42,7 +42,7 @@
where app_id = #{appId}
</select>
- <select id="getByTeamId"
resultType="org.apache.streampark.console.core.entity.FlinkSql"
parameterType="java.lang.Long">
+ <select id="selectSqlsByTeamId"
resultType="org.apache.streampark.console.core.entity.FlinkSql"
parameterType="java.lang.Long">
select s.*
from t_flink_sql s
inner join t_flink_app a
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 46f733e58..8910513ef 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
@@ -59,7 +59,7 @@
limit 1
</select>
- <select id="selectByTeamId"
resultType="org.apache.streampark.console.core.entity.Project"
parameterType="java.lang.Long">
+ <select id="selectProjectsByTeamId"
resultType="org.apache.streampark.console.core.entity.Project"
parameterType="java.lang.Long">
select *
from t_flink_project
where team_id = #{teamId}
@@ -77,7 +77,7 @@
where id = #{id}
</update>
- <select id="page"
resultType="org.apache.streampark.console.core.entity.Project"
parameterType="org.apache.streampark.console.core.entity.Project">
+ <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
<where>
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 21228ca97..6d4a79820 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
@@ -33,7 +33,7 @@
<result column="modify_time" jdbcType="TIMESTAMP"
property="modifyTime"/>
</resultMap>
- <select id="page"
resultType="org.apache.streampark.console.core.entity.Resource"
parameterType="org.apache.streampark.console.core.entity.Resource">
+ <select id="selectPage"
resultType="org.apache.streampark.console.core.entity.Resource"
parameterType="org.apache.streampark.console.core.entity.Resource">
select
v.*,
u.username as creatorName
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/VariableMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/VariableMapper.xml
index 80b986876..d89974845 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/VariableMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/VariableMapper.xml
@@ -29,7 +29,7 @@
<result column="modify_time" jdbcType="TIMESTAMP"
property="modifyTime"/>
</resultMap>
- <select id="page"
resultType="org.apache.streampark.console.core.entity.Variable"
parameterType="org.apache.streampark.console.core.entity.Variable">
+ <select id="selectPage"
resultType="org.apache.streampark.console.core.entity.Variable"
parameterType="org.apache.streampark.console.core.entity.Variable">
select
v.*,
u.username as creatorName
@@ -55,7 +55,7 @@
limit 1
</select>
- <select id="selectByTeamId"
resultType="org.apache.streampark.console.core.entity.Variable">
+ <select id="selectVarsByTeamId"
resultType="org.apache.streampark.console.core.entity.Variable">
select *
from t_variable
<where>
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 95e793751..82d9dbc4c 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
@@ -26,7 +26,7 @@
<result column="modify_time" jdbcType="DATE" property="modifyTime"/>
</resultMap>
- <select id="findQueues"
resultType="org.apache.streampark.console.core.entity.YarnQueue">
+ <select id="selectPage"
resultType="org.apache.streampark.console.core.entity.YarnQueue">
select * from t_yarn_queue
<where>
<if test="yarnQueue.teamId != null">
