This is an automated email from the ASF dual-hosted git repository.
achao 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 6ad91bc68 [Improve] mybatis-plus query improvements (#4161)
6ad91bc68 is described below
commit 6ad91bc6830106200bedd10921ddec9667bbfe87
Author: benjobs <[email protected]>
AuthorDate: Sun Jan 12 18:30:46 2025 +0800
[Improve] mybatis-plus query improvements (#4161)
* [Improve] mybatis-plus query improvements
* [Improve] mybatis exists minor improvement
---
.../impl/ApplicationLogServiceImpl.java | 14 ++++------
.../impl/SparkApplicationBackupServiceImpl.java | 11 +++-----
.../SparkApplicationBuildPipelineServiceImpl.java | 4 +--
.../impl/SparkApplicationConfigServiceImpl.java | 4 +--
.../impl/SparkApplicationInfoServiceImpl.java | 13 +++------
.../impl/SparkApplicationManageServiceImpl.java | 4 +--
.../core/service/impl/ExternalLinkServiceImpl.java | 20 ++++++--------
.../core/service/impl/FlinkClusterServiceImpl.java | 13 +++------
.../service/impl/FlinkEffectiveServiceImpl.java | 25 +++++++----------
.../core/service/impl/FlinkEnvServiceImpl.java | 11 +++-----
.../service/impl/FlinkSavepointServiceImpl.java | 32 ++++++++--------------
.../core/service/impl/FlinkSqlServiceImpl.java | 13 ++++-----
.../core/service/impl/ProjectServiceImpl.java | 16 +++++------
.../core/service/impl/ResourceServiceImpl.java | 16 ++++-------
.../service/impl/SparkEffectiveServiceImpl.java | 23 +++++++---------
.../core/service/impl/SparkEnvServiceImpl.java | 17 ++++++------
.../core/service/impl/SparkSqlServiceImpl.java | 15 ++++------
.../core/service/impl/VariableServiceImpl.java | 7 ++---
.../core/service/impl/YarnQueueServiceImpl.java | 12 +++-----
.../system/service/impl/MenuServiceImpl.java | 17 +++---------
.../system/service/impl/RoleServiceImpl.java | 10 ++-----
.../system/service/impl/TeamServiceImpl.java | 4 +--
22 files changed, 113 insertions(+), 188 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java
index feef8cc0c..3034f87f0 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java
@@ -23,7 +23,6 @@ import
org.apache.streampark.console.core.entity.ApplicationLog;
import org.apache.streampark.console.core.mapper.ApplicationLogMapper;
import
org.apache.streampark.console.core.service.application.ApplicationLogService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,18 +40,17 @@ public class ApplicationLogServiceImpl extends
ServiceImpl<ApplicationLogMapper,
@Override
public IPage<ApplicationLog> getPage(ApplicationLog applicationLog,
RestRequest request) {
- request.setSortField("option_time");
Page<ApplicationLog> page = MybatisPager.getPage(request);
- LambdaQueryWrapper<ApplicationLog> queryWrapper = new
LambdaQueryWrapper<ApplicationLog>()
- .eq(ApplicationLog::getAppId, applicationLog.getAppId());
- return this.page(page, queryWrapper);
+ return this.lambdaQuery()
+ .eq(ApplicationLog::getAppId, applicationLog.getAppId())
+ .orderByDesc(ApplicationLog::getOptionTime).page(page);
}
@Override
public void removeByAppId(Long appId) {
- LambdaQueryWrapper<ApplicationLog> queryWrapper = new
LambdaQueryWrapper<ApplicationLog>()
- .eq(ApplicationLog::getAppId, appId);
- this.remove(queryWrapper);
+ this.lambdaUpdate()
+ .eq(ApplicationLog::getAppId, appId)
+ .remove();
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBackupServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBackupServiceImpl.java
index 9811743b5..1a62563a8 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBackupServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBackupServiceImpl.java
@@ -35,7 +35,6 @@ import
org.apache.streampark.console.core.service.application.SparkApplicationBa
import
org.apache.streampark.console.core.service.application.SparkApplicationConfigService;
import
org.apache.streampark.console.core.service.application.SparkApplicationManageService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -147,9 +146,7 @@ public class SparkApplicationBackupServiceImpl
@Override
public void remove(SparkApplication appParam) {
try {
- baseMapper.delete(
- new LambdaQueryWrapper<SparkApplicationBackup>()
- .eq(SparkApplicationBackup::getAppId, appParam.getId()));
+ this.lambdaUpdate().eq(SparkApplicationBackup::getAppId,
appParam.getId()).remove();
appParam
.getFsOperator()
.delete(
@@ -165,10 +162,10 @@ public class SparkApplicationBackupServiceImpl
@Override
public void rollbackSparkSql(SparkApplication appParam, SparkSql
sparkSqlParam) {
- LambdaQueryWrapper<SparkApplicationBackup> queryWrapper = new
LambdaQueryWrapper<SparkApplicationBackup>()
+ SparkApplicationBackup backUp = this.lambdaQuery()
.eq(SparkApplicationBackup::getAppId, appParam.getId())
- .eq(SparkApplicationBackup::getSqlId, sparkSqlParam.getId());
- SparkApplicationBackup backUp = baseMapper.selectOne(queryWrapper);
+ .eq(SparkApplicationBackup::getSqlId, sparkSqlParam.getId())
+ .one();
ApiAlertException.throwIfNull(
backUp, "Application backup can't be null. Rollback spark sql
failed.");
// rollback config and sql
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java
index d870bd2d1..1ab5410e8 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java
@@ -73,7 +73,6 @@ import
org.apache.streampark.flink.packer.pipeline.impl.SparkYarnBuildPipeline;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.slf4j.Slf4j;
@@ -500,8 +499,7 @@ public class SparkApplicationBuildPipelineServiceImpl
@Override
public void removeByAppId(Long appId) {
- baseMapper.delete(
- new
LambdaQueryWrapper<ApplicationBuildPipeline>().eq(ApplicationBuildPipeline::getAppId,
appId));
+ this.lambdaUpdate().eq(ApplicationBuildPipeline::getAppId,
appId).remove();
}
/**
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 4886d0baa..a0f34601c 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
@@ -30,7 +30,6 @@ import
org.apache.streampark.console.core.mapper.SparkApplicationConfigMapper;
import org.apache.streampark.console.core.service.SparkEffectiveService;
import
org.apache.streampark.console.core.service.application.SparkApplicationConfigService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -257,8 +256,7 @@ public class SparkApplicationConfigServiceImpl
@Override
public void removeByAppId(Long appId) {
- baseMapper.delete(
- new
LambdaQueryWrapper<SparkApplicationConfig>().eq(SparkApplicationConfig::getAppId,
appId));
+ this.lambdaUpdate().eq(SparkApplicationConfig::getAppId,
appId).remove();
}
private void fillEffectiveField(Long id, List<SparkApplicationConfig>
configList) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationInfoServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationInfoServiceImpl.java
index d7dfa8860..b3350c5db 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationInfoServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationInfoServiceImpl.java
@@ -40,7 +40,6 @@ import org.apache.hadoop.yarn.api.records.ApplicationReport;
import org.apache.hadoop.yarn.api.records.YarnApplicationState;
import org.apache.hadoop.yarn.client.api.YarnClient;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j;
@@ -184,20 +183,17 @@ public class SparkApplicationInfoServiceImpl
@Override
public boolean existsByTeamId(Long teamId) {
- return baseMapper.exists(
- new
LambdaQueryWrapper<SparkApplication>().eq(SparkApplication::getTeamId, teamId));
+ return this.lambdaQuery().eq(SparkApplication::getTeamId,
teamId).exists();
}
@Override
public boolean existsByUserId(Long userId) {
- return baseMapper.exists(
- new
LambdaQueryWrapper<SparkApplication>().eq(SparkApplication::getUserId, userId));
+ return this.lambdaQuery().eq(SparkApplication::getUserId,
userId).exists();
}
@Override
public boolean existsBySparkEnvId(Long sparkEnvId) {
- return baseMapper.exists(
- new
LambdaQueryWrapper<SparkApplication>().eq(SparkApplication::getVersionId,
sparkEnvId));
+ return this.lambdaQuery().eq(SparkApplication::getVersionId,
sparkEnvId).exists();
}
@Override
@@ -304,8 +300,7 @@ public class SparkApplicationInfoServiceImpl
}
private boolean existsByAppName(String jobName) {
- return baseMapper.exists(
- new
LambdaQueryWrapper<SparkApplication>().eq(SparkApplication::getAppName,
jobName));
+ return this.lambdaQuery().eq(SparkApplication::getAppName,
jobName).exists();
}
@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 0bf25adbc..38c2c2a9a 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
@@ -56,7 +56,6 @@ import
org.apache.streampark.flink.packer.pipeline.PipelineStatusEnum;
import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -307,8 +306,7 @@ public class SparkApplicationManageServiceImpl
}
private boolean existsByAppName(String jobName) {
- return baseMapper.exists(
- new
LambdaQueryWrapper<SparkApplication>().eq(SparkApplication::getAppName,
jobName));
+ return this.lambdaQuery().eq(SparkApplication::getAppName,
jobName).exists();
}
@SuppressWarnings("checkstyle:WhitespaceAround")
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
index 9aad2476b..c095c3a79 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
@@ -26,7 +26,6 @@ import
org.apache.streampark.console.core.mapper.ExternalLinkMapper;
import org.apache.streampark.console.core.service.ExternalLinkService;
import
org.apache.streampark.console.core.service.application.FlinkApplicationManageService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -51,7 +50,7 @@ public class ExternalLinkServiceImpl extends
ServiceImpl<ExternalLinkMapper, Ext
@Override
public void create(ExternalLink externalLink) {
- if (!this.check(externalLink)) {
+ if (this.check(externalLink)) {
return;
}
externalLink.setId(null);
@@ -60,7 +59,7 @@ public class ExternalLinkServiceImpl extends
ServiceImpl<ExternalLinkMapper, Ext
@Override
public void update(ExternalLink externalLink) {
- if (!this.check(externalLink)) {
+ if (this.check(externalLink)) {
return;
}
baseMapper.updateById(externalLink);
@@ -96,24 +95,21 @@ public class ExternalLinkServiceImpl extends
ServiceImpl<ExternalLinkMapper, Ext
}
private boolean check(ExternalLink params) {
- LambdaQueryWrapper<ExternalLink> queryWrapper = new
LambdaQueryWrapper<ExternalLink>();
// badgeName and LinkUrl cannot be duplicated
- queryWrapper.nested(
+ ExternalLink result = this.lambdaQuery().nested(
qw -> qw.eq(ExternalLink::getBadgeName, params.getBadgeName())
.or()
- .eq(ExternalLink::getLinkUrl, params.getLinkUrl()));
- if (params.getId() != null) {
- queryWrapper.and(qw -> qw.ne(ExternalLink::getId, params.getId()));
- }
- ExternalLink result = this.getOne(queryWrapper);
+ .eq(ExternalLink::getLinkUrl, params.getLinkUrl()))
+ .and(params.getId() != null, qw -> qw.ne(ExternalLink::getId,
params.getId())).one();
+
if (result == null) {
- return true;
+ return false;
}
ApiAlertException.throwIfTrue(result.getBadgeName().equals(params.getBadgeName()),
String.format("The name: %s is already existing.",
result.getBadgeName()));
ApiAlertException.throwIfTrue(result.getLinkUrl().equals(params.getLinkUrl()),
String.format("The linkUrl: %s is already existing.",
result.getLinkUrl()));
- return false;
+ return true;
}
}
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 70f1a480d..11dba77ee 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
@@ -42,7 +42,6 @@ import
org.apache.streampark.flink.client.bean.ShutDownResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -96,14 +95,12 @@ public class FlinkClusterServiceImpl extends
ServiceImpl<FlinkClusterMapper, Fli
@Override
public List<FlinkCluster> listAvailableCluster() {
- LambdaQueryWrapper<FlinkCluster> lambdaQueryWrapper = new
LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(FlinkCluster::getClusterState,
ClusterState.RUNNING);
- return this.list(lambdaQueryWrapper);
+ return this.lambdaQuery().eq(FlinkCluster::getClusterState,
ClusterState.RUNNING.getState()).list();
}
@Override
- public ResponseResult check(FlinkCluster cluster) {
- ResponseResult result = new ResponseResult();
+ public ResponseResult<Void> check(FlinkCluster cluster) {
+ ResponseResult<Void> result = new ResponseResult<>();
result.setStatus(0);
// 1) Check name if already exists
@@ -290,9 +287,7 @@ public class FlinkClusterServiceImpl extends
ServiceImpl<FlinkClusterMapper, Fli
@Override
public Boolean existsByFlinkEnvId(Long flinkEnvId) {
- LambdaQueryWrapper<FlinkCluster> lambdaQueryWrapper = new
LambdaQueryWrapper<FlinkCluster>()
- .eq(FlinkCluster::getVersionId, flinkEnvId);
- return getBaseMapper().exists(lambdaQueryWrapper);
+ return this.lambdaQuery().eq(FlinkCluster::getVersionId,
flinkEnvId).exists();
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEffectiveServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEffectiveServiceImpl.java
index bdeb8c0e2..9e2e5a7b9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEffectiveServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEffectiveServiceImpl.java
@@ -22,7 +22,6 @@ import
org.apache.streampark.console.core.enums.EffectiveTypeEnum;
import org.apache.streampark.console.core.mapper.FlinkEffectiveMapper;
import org.apache.streampark.console.core.service.FlinkEffectiveService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
@@ -41,26 +40,24 @@ public class FlinkEffectiveServiceImpl extends
ServiceImpl<FlinkEffectiveMapper,
@Override
public void remove(Long appId, EffectiveTypeEnum effectiveTypeEnum) {
- LambdaQueryWrapper<FlinkEffective> queryWrapper = new
LambdaQueryWrapper<FlinkEffective>()
- .eq(FlinkEffective::getAppId, appId)
- .eq(FlinkEffective::getTargetType, effectiveTypeEnum.getType());
- baseMapper.delete(queryWrapper);
+ this.lambdaUpdate().eq(FlinkEffective::getAppId, appId)
+ .eq(FlinkEffective::getTargetType, effectiveTypeEnum.getType())
+ .remove();
}
@Override
public FlinkEffective get(Long appId, EffectiveTypeEnum effectiveTypeEnum)
{
- LambdaQueryWrapper<FlinkEffective> queryWrapper = new
LambdaQueryWrapper<FlinkEffective>()
- .eq(FlinkEffective::getAppId, appId)
- .eq(FlinkEffective::getTargetType, effectiveTypeEnum.getType());
- return this.getOne(queryWrapper);
+ return this.lambdaQuery().eq(FlinkEffective::getAppId, appId)
+ .eq(FlinkEffective::getTargetType, effectiveTypeEnum.getType())
+ .one();
}
@Override
public void saveOrUpdate(Long appId, EffectiveTypeEnum type, Long id) {
- LambdaQueryWrapper<FlinkEffective> queryWrapper = new
LambdaQueryWrapper<FlinkEffective>()
+ long count = this.lambdaQuery()
.eq(FlinkEffective::getAppId, appId)
- .eq(FlinkEffective::getTargetType, type.getType());
- long count = count(queryWrapper);
+ .eq(FlinkEffective::getTargetType, type.getType())
+ .count();
if (count == 0) {
FlinkEffective effective = new FlinkEffective();
effective.setAppId(appId);
@@ -79,8 +76,6 @@ public class FlinkEffectiveServiceImpl extends
ServiceImpl<FlinkEffectiveMapper,
@Override
public void removeByAppId(Long appId) {
- LambdaQueryWrapper<FlinkEffective> queryWrapper =
- new
LambdaQueryWrapper<FlinkEffective>().eq(FlinkEffective::getAppId, appId);
- this.remove(queryWrapper);
+ this.lambdaUpdate().eq(FlinkEffective::getAppId, appId).remove();
}
}
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 e1fbaf7f0..d422a81be 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
@@ -28,7 +28,6 @@ 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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -61,12 +60,10 @@ public class FlinkEnvServiceImpl extends
ServiceImpl<FlinkEnvMapper, FlinkEnv>
@Override
public FlinkEnvCheckEnum check(FlinkEnv version) {
// 1) check name
- LambdaQueryWrapper<FlinkEnv> queryWrapper = new
LambdaQueryWrapper<FlinkEnv>().eq(FlinkEnv::getFlinkName,
- version.getFlinkName());
- if (version.getId() != null) {
- queryWrapper.ne(FlinkEnv::getId, version.getId());
- }
- if (this.count(queryWrapper) > 0) {
+ boolean exists = this.lambdaQuery().eq(FlinkEnv::getFlinkName,
+ version.getFlinkName())
+ .ne(version.getId() != null, FlinkEnv::getId,
version.getId()).exists();
+ if (exists) {
return FlinkEnvCheckEnum.NAME_REPEATED;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
index a815748fa..30a4e0152 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
@@ -53,7 +53,6 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.RestOptions;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -117,9 +116,7 @@ public class FlinkSavepointServiceImpl extends
ServiceImpl<FlinkSavepointMapper,
public void expire(Long appId) {
FlinkSavepoint savepoint = new FlinkSavepoint();
savepoint.setLatest(false);
- LambdaQueryWrapper<FlinkSavepoint> queryWrapper =
- new
LambdaQueryWrapper<FlinkSavepoint>().eq(FlinkSavepoint::getAppId, appId);
- this.update(savepoint, queryWrapper);
+ this.lambdaUpdate().eq(FlinkSavepoint::getAppId,
appId).update(savepoint);
}
@Override
@@ -131,10 +128,10 @@ public class FlinkSavepointServiceImpl extends
ServiceImpl<FlinkSavepointMapper,
@Override
public FlinkSavepoint getLatest(Long id) {
- LambdaQueryWrapper<FlinkSavepoint> queryWrapper = new
LambdaQueryWrapper<FlinkSavepoint>()
+ return this.lambdaQuery()
.eq(FlinkSavepoint::getAppId, id)
- .eq(FlinkSavepoint::getLatest, true);
- return this.getOne(queryWrapper);
+ .eq(FlinkSavepoint::getLatest, true)
+ .one();
}
@Override
@@ -215,22 +212,17 @@ public class FlinkSavepointServiceImpl extends
ServiceImpl<FlinkSavepointMapper,
@Override
public IPage<FlinkSavepoint> getPage(FlinkSavepoint savepoint, RestRequest
request) {
- request.setSortField("trigger_time");
Page<FlinkSavepoint> page = MybatisPager.getPage(request);
- LambdaQueryWrapper<FlinkSavepoint> queryWrapper =
- new
LambdaQueryWrapper<FlinkSavepoint>().eq(FlinkSavepoint::getAppId,
- savepoint.getAppId());
- return this.page(page, queryWrapper);
+ return this.lambdaQuery().eq(FlinkSavepoint::getAppId,
+ savepoint.getAppId())
+ .orderByDesc(FlinkSavepoint::getTriggerTime)
+ .page(page);
}
@Override
public void remove(FlinkApplication appParam) {
Long appId = appParam.getId();
-
- LambdaQueryWrapper<FlinkSavepoint> queryWrapper =
- new
LambdaQueryWrapper<FlinkSavepoint>().eq(FlinkSavepoint::getAppId, appId);
- this.remove(queryWrapper);
-
+ this.lambdaUpdate().eq(FlinkSavepoint::getAppId, appId).remove();
try {
appParam
.getFsOperator()
@@ -470,11 +462,11 @@ public class FlinkSavepointServiceImpl extends
ServiceImpl<FlinkSavepointMapper,
return;
}
FlinkSavepoint savepoint = savepointPage.getRecords().get(cpThreshold
- 1);
- LambdaQueryWrapper<FlinkSavepoint> lambdaQueryWrapper = new
LambdaQueryWrapper<FlinkSavepoint>()
+ this.lambdaUpdate()
.eq(FlinkSavepoint::getAppId, entity.getAppId())
.eq(FlinkSavepoint::getType, CHECKPOINT.get())
- .lt(FlinkSavepoint::getTriggerTime, savepoint.getTriggerTime());
- this.remove(lambdaQueryWrapper);
+ .lt(FlinkSavepoint::getTriggerTime, savepoint.getTriggerTime())
+ .remove();
}
@Nonnull
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 80d5b95fb..4d3096708 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
@@ -35,9 +35,9 @@ import
org.apache.streampark.console.core.service.application.FlinkApplicationBa
import org.apache.streampark.flink.core.FlinkSqlValidationResult;
import org.apache.streampark.flink.proxy.FlinkShimsProxy;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import
com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
@@ -136,13 +136,12 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
@Override
public FlinkSql getCandidate(Long appId, CandidateTypeEnum
candidateTypeEnum) {
- LambdaQueryWrapper<FlinkSql> queryWrapper = new
LambdaQueryWrapper<FlinkSql>().eq(FlinkSql::getAppId, appId);
- if (candidateTypeEnum == null) {
- queryWrapper.gt(FlinkSql::getCandidate,
CandidateTypeEnum.NONE.get());
- } else {
- queryWrapper.eq(FlinkSql::getCandidate, candidateTypeEnum.get());
+ LambdaQueryChainWrapper<FlinkSql> search =
this.lambdaQuery().eq(FlinkSql::getAppId, appId);
+ if (candidateTypeEnum != null) {
+ search.eq(FlinkSql::getCandidate, candidateTypeEnum.get());
}
- return baseMapper.selectOne(queryWrapper);
+ return search.gt(candidateTypeEnum == null, FlinkSql::getCandidate,
CandidateTypeEnum.NONE.get())
+ .one();
}
@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 f067778de..47bd24f4a 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
@@ -122,11 +122,11 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
return false;
}
}
- LambdaQueryWrapper<Project> queryWrapper =
- new LambdaQueryWrapper<Project>()
- .eq(Project::getName, project.getName())
- .eq(Project::getTeamId, project.getTeamId());
- return this.baseMapper.selectCount(queryWrapper) > 0;
+
+ return this.lambdaQuery()
+ .eq(Project::getName, project.getName())
+ .eq(Project::getTeamId, project.getTeamId())
+ .exists();
}
@Override
@@ -299,10 +299,8 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
return false;
}
}
- return this.baseMapper.exists(
- new LambdaQueryWrapper<Project>()
- .eq(Project::getName, project.getName())
- .eq(Project::getTeamId, project.getTeamId()));
+ return this.lambdaQuery().eq(Project::getName, project.getName())
+ .eq(Project::getTeamId, project.getTeamId()).exists();
}
@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 98ddc1145..4cfe80093 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
@@ -52,7 +52,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.table.factories.Factory;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -188,10 +187,10 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
@Override
public Resource findByResourceName(Long teamId, String name) {
- LambdaQueryWrapper<Resource> queryWrapper = new
LambdaQueryWrapper<Resource>()
+ return this.lambdaQuery()
.eq(Resource::getResourceName, name)
- .eq(Resource::getTeamId, teamId);
- return baseMapper.selectOne(queryWrapper);
+ .eq(Resource::getTeamId, teamId)
+ .one();
}
@Override
@@ -378,12 +377,9 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
}
private boolean existsFlinkConnector(Long id, String connectorId) {
- LambdaQueryWrapper<Resource> lambdaQueryWrapper = new
LambdaQueryWrapper<Resource>()
- .eq(Resource::getResourceName, connectorId);
- if (id != null) {
- lambdaQueryWrapper.ne(Resource::getId, id);
- }
- return getBaseMapper().exists(lambdaQueryWrapper);
+ return this.lambdaQuery().eq(Resource::getResourceName, connectorId)
+ .ne(id != null, Resource::getId, id)
+ .exists();
}
private FlinkConnector getConnectorResource(List<File> jars, List<String>
factories) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkEffectiveServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkEffectiveServiceImpl.java
index d1369cce2..25d1c3ab1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkEffectiveServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkEffectiveServiceImpl.java
@@ -22,7 +22,6 @@ import
org.apache.streampark.console.core.enums.EffectiveTypeEnum;
import org.apache.streampark.console.core.mapper.SparkEffectiveMapper;
import org.apache.streampark.console.core.service.SparkEffectiveService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
@@ -41,26 +40,26 @@ public class SparkEffectiveServiceImpl extends
ServiceImpl<SparkEffectiveMapper,
@Override
public void remove(Long appId, EffectiveTypeEnum effectiveTypeEnum) {
- LambdaQueryWrapper<SparkEffective> queryWrapper = new
LambdaQueryWrapper<SparkEffective>()
+ this.lambdaUpdate()
.eq(SparkEffective::getAppId, appId)
- .eq(SparkEffective::getTargetType, effectiveTypeEnum.getType());
- baseMapper.delete(queryWrapper);
+ .eq(SparkEffective::getTargetType, effectiveTypeEnum.getType())
+ .remove();
}
@Override
public SparkEffective get(Long appId, EffectiveTypeEnum effectiveTypeEnum)
{
- LambdaQueryWrapper<SparkEffective> queryWrapper = new
LambdaQueryWrapper<SparkEffective>()
+ return this.lambdaQuery()
.eq(SparkEffective::getAppId, appId)
- .eq(SparkEffective::getTargetType, effectiveTypeEnum.getType());
- return this.getOne(queryWrapper);
+ .eq(SparkEffective::getTargetType, effectiveTypeEnum.getType())
+ .one();
}
@Override
public void saveOrUpdate(Long appId, EffectiveTypeEnum type, Long id) {
- LambdaQueryWrapper<SparkEffective> queryWrapper = new
LambdaQueryWrapper<SparkEffective>()
+ long count = this.lambdaQuery()
.eq(SparkEffective::getAppId, appId)
- .eq(SparkEffective::getTargetType, type.getType());
- long count = count(queryWrapper);
+ .eq(SparkEffective::getTargetType, type.getType())
+ .count();
if (count == 0) {
SparkEffective effective = new SparkEffective();
effective.setAppId(appId);
@@ -79,8 +78,6 @@ public class SparkEffectiveServiceImpl extends
ServiceImpl<SparkEffectiveMapper,
@Override
public void removeByAppId(Long appId) {
- LambdaQueryWrapper<SparkEffective> queryWrapper =
- new
LambdaQueryWrapper<SparkEffective>().eq(SparkEffective::getAppId, appId);
- this.remove(queryWrapper);
+ this.lambdaUpdate().eq(SparkEffective::getAppId, appId).remove();
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkEnvServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkEnvServiceImpl.java
index 2a05a7580..a578e47b7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkEnvServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkEnvServiceImpl.java
@@ -23,7 +23,6 @@ import
org.apache.streampark.console.core.enums.FlinkEnvCheckEnum;
import org.apache.streampark.console.core.mapper.SparkEnvMapper;
import org.apache.streampark.console.core.service.SparkEnvService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -49,12 +48,13 @@ public class SparkEnvServiceImpl extends
ServiceImpl<SparkEnvMapper, SparkEnv>
@Override
public FlinkEnvCheckEnum check(SparkEnv version) {
// 1) check name
- LambdaQueryWrapper<SparkEnv> queryWrapper = new
LambdaQueryWrapper<SparkEnv>().eq(SparkEnv::getSparkName,
- version.getSparkName());
- if (version.getId() != null) {
- queryWrapper.ne(SparkEnv::getId, version.getId());
- }
- if (this.count(queryWrapper) > 0) {
+ boolean exists = this.lambdaQuery()
+ .eq(SparkEnv::getSparkName,
+ version.getSparkName())
+ .ne(version.getId() != null, SparkEnv::getId, version.getId())
+ .exists();
+
+ if (exists) {
return FlinkEnvCheckEnum.NAME_REPEATED;
}
@@ -116,8 +116,7 @@ public class SparkEnvServiceImpl extends
ServiceImpl<SparkEnvMapper, SparkEnv>
@Override
public SparkEnv getDefault() {
- return this.baseMapper.selectOne(
- new LambdaQueryWrapper<SparkEnv>().eq(SparkEnv::getIsDefault,
true));
+ return this.lambdaQuery().eq(SparkEnv::getIsDefault, true).one();
}
@Override
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 3581b727c..167f6d5a8 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
@@ -35,9 +35,9 @@ import
org.apache.streampark.console.core.service.application.SparkApplicationBa
import org.apache.streampark.spark.client.proxy.SparkShimsProxy;
import org.apache.streampark.spark.core.util.SparkSqlValidationResult;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import
com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
@@ -136,13 +136,11 @@ public class SparkSqlServiceImpl extends
ServiceImpl<SparkSqlMapper, SparkSql>
@Override
public SparkSql getCandidate(Long appId, CandidateTypeEnum
candidateTypeEnum) {
- LambdaQueryWrapper<SparkSql> queryWrapper = new
LambdaQueryWrapper<SparkSql>().eq(SparkSql::getAppId, appId);
- if (candidateTypeEnum == null) {
- queryWrapper.gt(SparkSql::getCandidate,
CandidateTypeEnum.NONE.get());
- } else {
- queryWrapper.eq(SparkSql::getCandidate, candidateTypeEnum.get());
+ LambdaQueryChainWrapper<SparkSql> search =
this.lambdaQuery().eq(SparkSql::getAppId, appId);
+ if (candidateTypeEnum != null) {
+ search.eq(SparkSql::getCandidate, candidateTypeEnum.get());
}
- return baseMapper.selectOne(queryWrapper);
+ return search.gt(candidateTypeEnum == null, SparkSql::getCandidate,
CandidateTypeEnum.NONE.get()).one();
}
@Override
@@ -160,8 +158,7 @@ public class SparkSqlServiceImpl extends
ServiceImpl<SparkSqlMapper, SparkSql>
@Override
public void removeByAppId(Long appId) {
- LambdaQueryWrapper<SparkSql> queryWrapper = new
LambdaQueryWrapper<SparkSql>().eq(SparkSql::getAppId, appId);
- baseMapper.delete(queryWrapper);
+ this.lambdaUpdate().eq(SparkSql::getAppId, appId).remove();
}
@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 e07bfbd1f..be0ff0bad 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
@@ -34,7 +34,6 @@ import org.apache.streampark.console.core.util.ServiceHelper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -144,10 +143,10 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
@Override
public Variable findByVariableCode(Long teamId, String variableCode) {
- LambdaQueryWrapper<Variable> queryWrapper = new
LambdaQueryWrapper<Variable>()
+ return this.lambdaQuery()
.eq(Variable::getVariableCode, variableCode)
- .eq(Variable::getTeamId, teamId);
- return baseMapper.selectOne(queryWrapper);
+ .eq(Variable::getTeamId, teamId)
+ .one();
}
/**
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 3b7367482..0fcc3ff06 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
@@ -35,7 +35,6 @@ import
org.apache.streampark.console.core.service.application.FlinkApplicationMa
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -199,17 +198,14 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
@Override
public boolean existByQueueLabel(String queueLabel) {
- return getBaseMapper()
- .exists(new
LambdaQueryWrapper<YarnQueue>().eq(YarnQueue::getQueueLabel, queueLabel));
+ return this.lambdaQuery().eq(YarnQueue::getQueueLabel,
queueLabel).exists();
}
@Override
public boolean existByTeamIdQueueLabel(Long teamId, String queueLabel) {
- return getBaseMapper()
- .exists(
- new LambdaQueryWrapper<YarnQueue>()
- .eq(YarnQueue::getTeamId, teamId)
- .eq(YarnQueue::getQueueLabel, queueLabel));
+ return this.lambdaQuery().eq(YarnQueue::getTeamId, teamId)
+ .eq(YarnQueue::getQueueLabel, queueLabel)
+ .exists();
}
// --------- private methods------------
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
index f1907df3b..5a8b551a8 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -30,7 +30,6 @@ import
org.apache.streampark.console.system.service.UserService;
import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -88,17 +87,9 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper,
Menu> implements Me
public Map<String, Object> listMenuMap(Menu menu) {
Map<String, Object> result = new HashMap<>(16);
try {
- LambdaQueryWrapper<Menu> queryWrapper = new LambdaQueryWrapper<>();
- if (StringUtils.isNotBlank(menu.getMenuName())) {
- queryWrapper.eq(Menu::getMenuName, menu.getMenuName());
- }
- if (StringUtils.isNotBlank(menu.getCreateTimeFrom())
- && StringUtils.isNotBlank(menu.getCreateTimeTo())) {
- queryWrapper
- .ge(Menu::getCreateTime, menu.getCreateTimeFrom())
- .le(Menu::getCreateTime, menu.getCreateTimeTo());
- }
- List<Menu> menus = baseMapper.selectList(queryWrapper);
+ List<Menu> menus = this.lambdaQuery()
+ .eq(StringUtils.isNotBlank(menu.getMenuName()),
Menu::getMenuName, menu.getMenuName())
+ .list();
List<RouterTree<Menu>> trees = new ArrayList<>();
List<String> ids = new ArrayList<>();
@@ -106,7 +97,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper,
Menu> implements Me
menus.forEach(
m -> {
ids.add(m.getMenuId().toString());
- trees.add(new RouterTree(m));
+ trees.add(new RouterTree<>(m));
});
result.put(IDS, ids);
result.put(TOTAL, menus.size());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
index 659777d4c..c841c5f7b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
@@ -32,7 +32,6 @@ import
org.apache.streampark.console.system.service.RoleService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -69,7 +68,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@Override
public Role getByName(String roleName) {
- return baseMapper.selectOne(new
LambdaQueryWrapper<Role>().eq(Role::getRoleName, roleName));
+ return this.lambdaQuery().eq(Role::getRoleName, roleName).one();
}
@Override
@@ -100,10 +99,7 @@ public class RoleServiceImpl extends
ServiceImpl<RoleMapper, Role> implements Ro
@Override
public void updateRole(Role role) {
baseMapper.updateById(role);
- LambdaQueryWrapper<RoleMenu> queryWrapper = new
LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId,
- role.getRoleId());
- roleMenuMapper.delete(queryWrapper);
-
+ roleMenuService.removeByRoleId(role.getRoleId());
String menuId = role.getMenuId();
if (StringUtils.contains(menuId, Constant.APP_DETAIL_MENU_ID)
&& !StringUtils.contains(menuId, Constant.APP_MENU_ID)) {
@@ -126,6 +122,6 @@ public class RoleServiceImpl extends
ServiceImpl<RoleMapper, Role> implements Ro
@Override
public Role getSysDefaultRole() {
- return baseMapper.selectOne(new
LambdaQueryWrapper<Role>().eq(Role::getRoleId, Constant.DEFAULT_ROLE_ID));
+ return this.lambdaQuery().eq(Role::getRoleId,
Constant.DEFAULT_ROLE_ID).one();
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
index a2b5a07df..d40ee2741 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
@@ -33,7 +33,6 @@ import
org.apache.streampark.console.system.service.MemberService;
import org.apache.streampark.console.system.service.TeamService;
import org.apache.streampark.console.system.service.UserService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -74,8 +73,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
@Override
public Team getByName(String teamName) {
- LambdaQueryWrapper<Team> queryWrapper = new
LambdaQueryWrapper<Team>().eq(Team::getTeamName, teamName);
- return baseMapper.selectOne(queryWrapper);
+ return this.lambdaQuery().eq(Team::getTeamName, teamName).one();
}
@Override
