This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch LambdaQueryWrapper in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit ad5ac06e00f99185d24410d00bda6aa696b2d1f0 Author: benjobs <[email protected]> AuthorDate: Sat Nov 30 15:55:58 2024 +0800 [Improve] mybatis-plus LambdaQueryWrapper improvements --- .../service/alert/impl/AlertConfigServiceImpl.java | 8 ++-- .../impl/FlinkApplicationBackupServiceImpl.java | 25 +++++-------- .../FlinkApplicationBuildPipelineServiceImpl.java | 10 ++--- .../impl/FlinkApplicationConfigServiceImpl.java | 30 +++++---------- .../impl/FlinkApplicationInfoServiceImpl.java | 24 ++++-------- .../impl/FlinkApplicationManageServiceImpl.java | 43 ++++++++-------------- .../core/service/impl/FlinkEnvServiceImpl.java | 3 +- .../core/service/impl/FlinkSqlServiceImpl.java | 20 +++------- .../core/service/impl/MessageServiceImpl.java | 7 +--- .../core/service/impl/SettingServiceImpl.java | 9 ++--- .../system/service/impl/MemberServiceImpl.java | 13 ++----- .../system/service/impl/MenuServiceImpl.java | 5 +-- .../system/service/impl/RoleMenuServiceImpl.java | 12 ++---- .../system/service/impl/UserServiceImpl.java | 12 ++---- 14 files changed, 73 insertions(+), 148 deletions(-) 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 75280e364..b0b354273 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 @@ -31,6 +31,7 @@ import org.apache.commons.collections.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -54,11 +55,10 @@ public class AlertConfigServiceImpl extends ServiceImpl<AlertConfigMapper, Alert @Override public IPage<AlertConfigParams> page(Long userId, RestRequest request) { // build query conditions - LambdaQueryWrapper<AlertConfig> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(userId != null, AlertConfig::getUserId, userId); - Page<AlertConfig> page = MybatisPager.getPage(request); - IPage<AlertConfig> resultPage = getBaseMapper().selectPage(page, wrapper); + IPage<AlertConfig> resultPage = getBaseMapper().selectPage( + page, + Wrappers.<AlertConfig>lambdaQuery().eq(userId != null, AlertConfig::getUserId, userId)); Page<AlertConfigParams> result = new Page<>(); if (CollectionUtils.isNotEmpty(resultPage.getRecords())) { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java index aa344b143..ae69e01a5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java @@ -35,7 +35,6 @@ import org.apache.streampark.console.core.service.application.FlinkApplicationBa import org.apache.streampark.console.core.service.application.FlinkApplicationConfigService; import org.apache.streampark.console.core.service.application.FlinkApplicationManageService; -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; @@ -70,9 +69,8 @@ public class FlinkApplicationBackupServiceImpl @Override public IPage<FlinkApplicationBackup> getPage(FlinkApplicationBackup bakParam, RestRequest request) { Page<FlinkApplicationBackup> page = MybatisPager.getPage(request); - LambdaQueryWrapper<FlinkApplicationBackup> queryWrapper = new LambdaQueryWrapper<FlinkApplicationBackup>() - .eq(FlinkApplicationBackup::getAppId, bakParam.getAppId()); - return this.baseMapper.selectPage(page, queryWrapper); + return this.baseMapper.selectPage(page, + this.lambdaQuery().eq(FlinkApplicationBackup::getAppId, bakParam.getAppId())); } @Override @@ -135,11 +133,9 @@ public class FlinkApplicationBackupServiceImpl public void revoke(FlinkApplication appParam) { Page<FlinkApplicationBackup> page = new Page<>(); page.setCurrent(0).setSize(1).setSearchCount(false); - LambdaQueryWrapper<FlinkApplicationBackup> queryWrapper = new LambdaQueryWrapper<FlinkApplicationBackup>() - .eq(FlinkApplicationBackup::getAppId, appParam.getId()) - .orderByDesc(FlinkApplicationBackup::getCreateTime); - - Page<FlinkApplicationBackup> backUpPages = baseMapper.selectPage(page, queryWrapper); + Page<FlinkApplicationBackup> backUpPages = + baseMapper.selectPage(page, this.lambdaQuery().eq(FlinkApplicationBackup::getAppId, appParam.getId()) + .orderByDesc(FlinkApplicationBackup::getCreateTime)); if (!backUpPages.getRecords().isEmpty()) { FlinkApplicationBackup backup = backUpPages.getRecords().get(0); String path = backup.getPath(); @@ -151,9 +147,7 @@ public class FlinkApplicationBackupServiceImpl @Override public void remove(FlinkApplication appParam) { try { - baseMapper.delete( - new LambdaQueryWrapper<FlinkApplicationBackup>() - .eq(FlinkApplicationBackup::getAppId, appParam.getId())); + this.lambdaUpdate().eq(FlinkApplicationBackup::getAppId, appParam.getId()).remove(); appParam .getFsOperator() .delete( @@ -169,10 +163,9 @@ public class FlinkApplicationBackupServiceImpl @Override public void rollbackFlinkSql(FlinkApplication appParam, FlinkSql flinkSqlParam) { - LambdaQueryWrapper<FlinkApplicationBackup> queryWrapper = new LambdaQueryWrapper<FlinkApplicationBackup>() - .eq(FlinkApplicationBackup::getAppId, appParam.getId()) - .eq(FlinkApplicationBackup::getSqlId, flinkSqlParam.getId()); - FlinkApplicationBackup backUp = baseMapper.selectOne(queryWrapper); + FlinkApplicationBackup backUp = + baseMapper.selectOne(this.lambdaQuery().eq(FlinkApplicationBackup::getAppId, appParam.getId()) + .eq(FlinkApplicationBackup::getSqlId, flinkSqlParam.getId())); ApiAlertException.throwIfNull( backUp, "Application backup can't be null. Rollback flink 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/FlinkApplicationBuildPipelineServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java index fcd6008cc..db30f140e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java @@ -85,7 +85,6 @@ import org.apache.streampark.flink.packer.pipeline.impl.FlinkYarnApplicationBuil 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 com.github.benmanes.caffeine.cache.Cache; @@ -631,10 +630,8 @@ public class FlinkApplicationBuildPipelineServiceImpl if (CollectionUtils.isEmpty(appIds)) { return new HashMap<>(); } - LambdaQueryWrapper<ApplicationBuildPipeline> queryWrapper = new LambdaQueryWrapper<ApplicationBuildPipeline>() - .in(ApplicationBuildPipeline::getAppId, appIds); - - List<ApplicationBuildPipeline> appBuildPipelines = baseMapper.selectList(queryWrapper); + List<ApplicationBuildPipeline> appBuildPipelines = + this.lambdaQuery().in(ApplicationBuildPipeline::getAppId, appIds).list(); if (CollectionUtils.isEmpty(appBuildPipelines)) { return new HashMap<>(); } @@ -644,8 +641,7 @@ public class FlinkApplicationBuildPipelineServiceImpl @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/FlinkApplicationConfigServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java index 2f8a02dbc..a1e53ad66 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java @@ -30,10 +30,7 @@ import org.apache.streampark.console.core.mapper.FlinkApplicationConfigMapper; import org.apache.streampark.console.core.service.FlinkEffectiveService; import org.apache.streampark.console.core.service.application.FlinkApplicationConfigService; -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; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -92,13 +89,10 @@ public class FlinkApplicationConfigServiceImpl } public void setLatest(Long appId, Long configId) { - LambdaUpdateWrapper<FlinkApplicationConfig> updateWrapper = Wrappers.lambdaUpdate(); - updateWrapper.set(FlinkApplicationConfig::getLatest, false).eq(FlinkApplicationConfig::getAppId, appId); - this.update(updateWrapper); - - updateWrapper.clear(); - updateWrapper.set(FlinkApplicationConfig::getLatest, true).eq(FlinkApplicationConfig::getId, configId); - this.update(updateWrapper); + this.lambdaUpdate().eq(FlinkApplicationConfig::getAppId, appId).set(FlinkApplicationConfig::getLatest, false) + .update(); + this.lambdaUpdate().eq(FlinkApplicationConfig::getId, configId).set(FlinkApplicationConfig::getLatest, true) + .update(); } @Override @@ -187,9 +181,8 @@ public class FlinkApplicationConfigServiceImpl @Override public void toEffective(Long appId, Long configId) { - LambdaUpdateWrapper<FlinkApplicationConfig> updateWrapper = Wrappers.lambdaUpdate(); - updateWrapper.eq(FlinkApplicationConfig::getAppId, appId).set(FlinkApplicationConfig::getLatest, false); - this.update(updateWrapper); + this.lambdaUpdate().eq(FlinkApplicationConfig::getAppId, appId).set(FlinkApplicationConfig::getLatest, false) + .update(); effectiveService.saveOrUpdate(appId, EffectiveTypeEnum.CONFIG, configId); } @@ -225,11 +218,9 @@ public class FlinkApplicationConfigServiceImpl @Override public List<FlinkApplicationConfig> list(Long appId) { - LambdaQueryWrapper<FlinkApplicationConfig> queryWrapper = new LambdaQueryWrapper<FlinkApplicationConfig>() - .eq(FlinkApplicationConfig::getAppId, appId) - .orderByDesc(FlinkApplicationConfig::getVersion); - - List<FlinkApplicationConfig> configList = this.baseMapper.selectList(queryWrapper); + List<FlinkApplicationConfig> configList = + this.baseMapper.selectList(this.lambdaQuery().eq(FlinkApplicationConfig::getAppId, appId) + .orderByDesc(FlinkApplicationConfig::getVersion)); fillEffectiveField(appId, configList); return configList; } @@ -257,8 +248,7 @@ public class FlinkApplicationConfigServiceImpl @Override public void removeByAppId(Long appId) { - baseMapper.delete( - new LambdaQueryWrapper<FlinkApplicationConfig>().eq(FlinkApplicationConfig::getAppId, appId)); + this.lambdaUpdate().eq(FlinkApplicationConfig::getAppId, appId).remove(); } private void fillEffectiveField(Long id, List<FlinkApplicationConfig> configList) { 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 692794597..966255189 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 @@ -53,7 +53,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; @@ -251,14 +250,12 @@ public class FlinkApplicationInfoServiceImpl extends ServiceImpl<FlinkApplicatio @Override public boolean existsByTeamId(Long teamId) { - return baseMapper.exists( - new LambdaQueryWrapper<FlinkApplication>().eq(FlinkApplication::getTeamId, teamId)); + return this.lambdaQuery().eq(FlinkApplication::getTeamId, teamId).exists(); } @Override public boolean existsByUserId(Long userId) { - return baseMapper.exists( - new LambdaQueryWrapper<FlinkApplication>().eq(FlinkApplication::getUserId, userId)); + return this.lambdaQuery().eq(FlinkApplication::getUserId, userId).exists(); } @Override @@ -273,17 +270,13 @@ public class FlinkApplicationInfoServiceImpl extends ServiceImpl<FlinkApplicatio @Override public boolean existsByClusterId(Long clusterId) { - return baseMapper.exists( - new LambdaQueryWrapper<FlinkApplication>().eq(FlinkApplication::getFlinkClusterId, clusterId)); + return this.lambdaQuery().eq(FlinkApplication::getFlinkClusterId, clusterId).exists(); } @Override public Integer countByClusterId(Long clusterId) { - return baseMapper - .selectCount( - new LambdaQueryWrapper<FlinkApplication>().eq(FlinkApplication::getFlinkClusterId, - clusterId)) - .intValue(); + return this.lambdaQuery().eq(FlinkApplication::getFlinkClusterId, + clusterId).count().intValue(); } @Override @@ -293,8 +286,7 @@ public class FlinkApplicationInfoServiceImpl extends ServiceImpl<FlinkApplicatio @Override public boolean existsByFlinkEnvId(Long flinkEnvId) { - return baseMapper.exists( - new LambdaQueryWrapper<FlinkApplication>().eq(FlinkApplication::getVersionId, flinkEnvId)); + return this.lambdaQuery().eq(FlinkApplication::getVersionId, flinkEnvId).exists(); } @Override @@ -434,8 +426,8 @@ public class FlinkApplicationInfoServiceImpl extends ServiceImpl<FlinkApplicatio return AppExistsStateEnum.INVALID; } - FlinkApplication application = baseMapper.selectOne( - new LambdaQueryWrapper<FlinkApplication>().eq(FlinkApplication::getJobName, jobName)); + FlinkApplication application = this.lambdaQuery().eq(FlinkApplication::getJobName, jobName).getEntity(); + if (application != null && !application.getId().equals(appParamId)) { return AppExistsStateEnum.IN_DB; } 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 2e8446775..a76c12d0d 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 @@ -66,10 +66,7 @@ import org.apache.streampark.flink.packer.pipeline.PipelineStatusEnum; import org.apache.commons.lang3.ArrayUtils; 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; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -317,10 +314,8 @@ public class FlinkApplicationManageServiceImpl extends ServiceImpl<FlinkApplicat @Override public void changeOwnership(Long userId, Long targetUserId) { - LambdaUpdateWrapper<FlinkApplication> updateWrapper = new LambdaUpdateWrapper<FlinkApplication>() - .eq(FlinkApplication::getUserId, userId) - .set(FlinkApplication::getUserId, targetUserId); - this.baseMapper.update(null, updateWrapper); + this.lambdaUpdate().eq(FlinkApplication::getUserId, userId) + .set(FlinkApplication::getUserId, targetUserId).update(); } @SneakyThrows @@ -375,8 +370,7 @@ public class FlinkApplicationManageServiceImpl extends ServiceImpl<FlinkApplicat } private boolean existsByJobName(String jobName) { - return baseMapper.exists( - new LambdaQueryWrapper<FlinkApplication>().eq(FlinkApplication::getJobName, jobName)); + return this.lambdaQuery().eq(FlinkApplication::getJobName, jobName).exists(); } @SuppressWarnings("checkstyle:WhitespaceAround") @@ -669,14 +663,12 @@ public class FlinkApplicationManageServiceImpl extends ServiceImpl<FlinkApplicat @Override public void updateRelease(FlinkApplication appParam) { - LambdaUpdateWrapper<FlinkApplication> updateWrapper = Wrappers.lambdaUpdate(); - updateWrapper.eq(FlinkApplication::getId, appParam.getId()); - updateWrapper.set(FlinkApplication::getRelease, appParam.getRelease()); - updateWrapper.set(FlinkApplication::getBuild, appParam.getBuild()); - if (appParam.getOptionState() != null) { - updateWrapper.set(FlinkApplication::getOptionState, appParam.getOptionState()); - } - this.update(updateWrapper); + this.lambdaUpdate() + .eq(FlinkApplication::getId, appParam.getId()) + .set(FlinkApplication::getRelease, appParam.getRelease()) + .set(FlinkApplication::getBuild, appParam.getBuild()) + .set(appParam.getOptionState() != null, FlinkApplication::getOptionState, appParam.getOptionState()) + .update(); } @Override @@ -695,7 +687,7 @@ public class FlinkApplicationManageServiceImpl extends ServiceImpl<FlinkApplicat @Nonnull Collection<FlinkDeployMode> deployModeEnums) { return getBaseMapper() .selectList( - new LambdaQueryWrapper<FlinkApplication>() + this.lambdaQuery() .eq((SFunction<FlinkApplication, Long>) FlinkApplication::getTeamId, teamId) .in( @@ -709,16 +701,11 @@ public class FlinkApplicationManageServiceImpl extends ServiceImpl<FlinkApplicat public boolean checkBuildAndUpdate(FlinkApplication appParam) { boolean build = appParam.getBuild(); if (!build) { - LambdaUpdateWrapper<FlinkApplication> updateWrapper = Wrappers.lambdaUpdate(); - updateWrapper.eq(FlinkApplication::getId, appParam.getId()); - if (appParam.isRunning()) { - updateWrapper.set(FlinkApplication::getRelease, ReleaseStateEnum.NEED_RESTART.get()); - } else { - updateWrapper.set(FlinkApplication::getRelease, ReleaseStateEnum.DONE.get()); - updateWrapper.set(FlinkApplication::getOptionState, OptionStateEnum.NONE.getValue()); - } - this.update(updateWrapper); - + this.lambdaUpdate().eq(FlinkApplication::getId, appParam.getId()) + .set(appParam.isRunning(), FlinkApplication::getRelease, ReleaseStateEnum.NEED_RESTART.get()) + .set(!appParam.isRunning(), FlinkApplication::getRelease, ReleaseStateEnum.DONE.get()) + .set(!appParam.isRunning(), FlinkApplication::getOptionState, OptionStateEnum.NONE.getValue()) + .update(); // backup if (appParam.isFlinkSqlJob()) { FlinkSql newFlinkSql = flinkSqlService.getCandidate(appParam.getId(), CandidateTypeEnum.NEW); 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 84e1620e3..a151c0ea2 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 @@ -138,8 +138,7 @@ public class FlinkEnvServiceImpl extends ServiceImpl<FlinkEnvMapper, FlinkEnv> @Override public FlinkEnv getDefault() { - return this.baseMapper.selectOne( - new LambdaQueryWrapper<FlinkEnv>().eq(FlinkEnv::getIsDefault, true)); + return this.lambdaQuery().eq(FlinkEnv::getIsDefault, true).getEntity(); } @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 842c0017c..3ab8348b4 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 @@ -81,11 +81,8 @@ public class FlinkSqlServiceImpl extends ServiceImpl<FlinkSqlMapper, FlinkSql> public FlinkSql getLatestFlinkSql(Long appId, boolean decode) { Page<FlinkSql> page = new Page<>(); page.setCurrent(0).setSize(1).setSearchCount(false); - LambdaQueryWrapper<FlinkSql> queryWrapper = new LambdaQueryWrapper<FlinkSql>() - .eq(FlinkSql::getAppId, appId) - .orderByDesc(FlinkSql::getVersion); - - Page<FlinkSql> flinkSqlPage = baseMapper.selectPage(page, queryWrapper); + Page<FlinkSql> flinkSqlPage = baseMapper.selectPage(page, this.lambdaQuery().eq(FlinkSql::getAppId, appId) + .orderByDesc(FlinkSql::getVersion)); return Optional.ofNullable(flinkSqlPage.getRecords()) .filter(records -> !records.isEmpty()) .map(records -> records.get(0)) @@ -124,11 +121,8 @@ public class FlinkSqlServiceImpl extends ServiceImpl<FlinkSqlMapper, FlinkSql> @Override public List<FlinkSql> listFlinkSqlHistory(Long appId) { - LambdaQueryWrapper<FlinkSql> queryWrapper = new LambdaQueryWrapper<FlinkSql>() - .eq(FlinkSql::getAppId, appId) - .orderByDesc(FlinkSql::getVersion); - - List<FlinkSql> sqlList = this.baseMapper.selectList(queryWrapper); + List<FlinkSql> sqlList = this.baseMapper + .selectList(this.lambdaQuery().eq(FlinkSql::getAppId, appId).orderByDesc(FlinkSql::getVersion)); FlinkSql effective = getEffective(appId, false); if (effective != null) { sqlList.stream() @@ -165,8 +159,7 @@ public class FlinkSqlServiceImpl extends ServiceImpl<FlinkSqlMapper, FlinkSql> @Override public void removeByAppId(Long appId) { - LambdaQueryWrapper<FlinkSql> queryWrapper = new LambdaQueryWrapper<FlinkSql>().eq(FlinkSql::getAppId, appId); - baseMapper.delete(queryWrapper); + this.lambdaUpdate().eq(FlinkSql::getAppId, appId).remove(); } @Override @@ -219,8 +212,7 @@ public class FlinkSqlServiceImpl extends ServiceImpl<FlinkSqlMapper, FlinkSql> public IPage<FlinkSql> getPage(Long appId, RestRequest request) { request.setSortField("version"); Page<FlinkSql> page = MybatisPager.getPage(request); - LambdaQueryWrapper<FlinkSql> queryWrapper = new LambdaQueryWrapper<FlinkSql>().eq(FlinkSql::getAppId, appId); - IPage<FlinkSql> sqlList = this.baseMapper.selectPage(page, queryWrapper); + IPage<FlinkSql> sqlList = this.baseMapper.selectPage(page, this.lambdaQuery().eq(FlinkSql::getAppId, appId)); FlinkSql effectiveSql = baseMapper.getEffective(appId); if (effectiveSql != null) { for (FlinkSql sql : sqlList.getRecords()) { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java index 462ee8ddc..864f05430 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java @@ -25,7 +25,6 @@ import org.apache.streampark.console.core.mapper.MessageMapper; import org.apache.streampark.console.core.service.MessageService; import org.apache.streampark.console.core.websocket.WebSocketEndpoint; -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; @@ -50,10 +49,8 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> @Override public IPage<Message> getUnReadPage(NoticeTypeEnum noticeTypeEnum, RestRequest request) { Page<Message> page = MybatisPager.getPage(request); - LambdaQueryWrapper<Message> queryWrapper = new LambdaQueryWrapper<Message>() - .eq(Message::getIsRead, false) + return this.baseMapper.selectPage(page, this.lambdaQuery().eq(Message::getIsRead, false) .orderByDesc(Message::getCreateTime) - .eq(Message::getType, noticeTypeEnum); - return this.baseMapper.selectPage(page, queryWrapper); + .eq(Message::getType, noticeTypeEnum)); } } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java index a3a0b2b72..f40fdaaef 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java @@ -28,7 +28,6 @@ import org.apache.streampark.console.core.service.SettingService; import org.apache.commons.lang3.StringUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.model.AuthConfig; @@ -69,8 +68,7 @@ public class SettingServiceImpl extends ServiceImpl<SettingMapper, Setting> @Override public Setting get(String key) { - LambdaQueryWrapper<Setting> queryWrapper = new LambdaQueryWrapper<Setting>().eq(Setting::getSettingKey, key); - return this.getOne(queryWrapper); + return this.lambdaQuery().eq(Setting::getSettingKey, key).getEntity(); } @Override @@ -81,9 +79,8 @@ public class SettingServiceImpl extends ServiceImpl<SettingMapper, Setting> Setting entity = new Setting(); entity.setSettingValue(setting.getSettingValue()); - LambdaQueryWrapper<Setting> queryWrapper = new LambdaQueryWrapper<Setting>().eq(Setting::getSettingKey, - setting.getSettingKey()); - this.update(entity, queryWrapper); + + this.lambdaUpdate().set(Setting::getSettingKey, setting.getSettingKey()).update(entity); getMavenConfig().updateConfig(); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java index fec9f8353..3e07a9d95 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java @@ -30,7 +30,6 @@ import org.apache.streampark.console.system.service.RoleService; 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; @@ -70,8 +69,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme @Override public void removeByTeamId(Long teamId) { - LambdaQueryWrapper<Member> queryWrapper = new LambdaQueryWrapper<Member>().eq(Member::getTeamId, teamId); - this.remove(queryWrapper); + this.lambdaUpdate().eq(Member::getTeamId, teamId).remove(); } @Override @@ -102,16 +100,13 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme private Member findByUserId(Long teamId, Long userId) { ApiAlertException.throwIfNull(teamId, "The team id is required."); - LambdaQueryWrapper<Member> queryWrapper = new LambdaQueryWrapper<Member>() - .eq(Member::getTeamId, teamId) - .eq(Member::getUserId, userId); - return baseMapper.selectOne(queryWrapper); + return this.lambdaQuery().eq(Member::getTeamId, teamId) + .eq(Member::getUserId, userId).getEntity(); } @Override public List<Long> listUserIdsByRoleId(Long roleId) { - LambdaQueryWrapper<Member> queryWrapper = new LambdaQueryWrapper<Member>().eq(Member::getRoleId, roleId); - List<Member> memberList = baseMapper.selectList(queryWrapper); + List<Member> memberList = this.lambdaQuery().eq(Member::getRoleId, roleId).list(); return memberList.stream().map(Member::getUserId).collect(Collectors.toList()); } 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 12a040342..f1907df3b 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 @@ -78,9 +78,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me String.format("The userId:[%s] not found", userId))); // Admin has the permission for all menus. if (UserTypeEnum.ADMIN == user.getUserType()) { - LambdaQueryWrapper<Menu> queryWrapper = new LambdaQueryWrapper<Menu>().eq(Menu::getType, "0") - .orderByAsc(Menu::getOrderNum); - return this.list(queryWrapper); + return this.lambdaQuery().eq(Menu::getType, "0") + .orderByAsc(Menu::getOrderNum).list(); } return this.baseMapper.selectMenus(userId, teamId); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java index a24260a83..d1c3eb9d7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java @@ -21,7 +21,6 @@ import org.apache.streampark.console.system.entity.RoleMenu; import org.apache.streampark.console.system.mapper.RoleMenuMapper; import org.apache.streampark.console.system.service.RoleMenuService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -39,22 +38,17 @@ public class RoleMenuServiceImpl extends ServiceImpl<RoleMenuMapper, RoleMenu> @Override @Transactional public void removeByRoleId(Long roleId) { - LambdaQueryWrapper<RoleMenu> queryWrapper = new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId); - baseMapper.delete(queryWrapper); + this.lambdaUpdate().eq(RoleMenu::getRoleId, roleId).remove(); } @Override @Transactional public void removeByMenuIds(String[] menuIds) { - List<String> menuIdList = Arrays.asList(menuIds); - LambdaQueryWrapper<RoleMenu> queryWrapper = new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getMenuId, - menuIdList); - baseMapper.delete(queryWrapper); + this.lambdaUpdate().in(RoleMenu::getRoleId, Arrays.asList(menuIds)).remove(); } @Override public List<RoleMenu> listByRoleId(String roleId) { - LambdaQueryWrapper<RoleMenu> queryWrapper = new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId); - return baseMapper.selectList(queryWrapper); + return this.lambdaQuery().eq(RoleMenu::getRoleId, roleId).list(); } } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java index cf9de0521..3c52bb04e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java @@ -44,7 +44,6 @@ import org.apache.streampark.console.system.service.UserService; import org.apache.commons.lang3.RandomStringUtils; 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; @@ -93,8 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us @Override public User getByUsername(String username) { - LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<User>().eq(User::getUsername, username); - return baseMapper.selectOne(queryWrapper); + return this.lambdaQuery().eq(User::getUsername, username).getEntity(); } @Override @@ -110,10 +108,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us @Override public void updateLoginTime(String username) { - User user = new User(); - user.setLastLoginTime(new Date()); - LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<User>().eq(User::getUsername, username); - this.baseMapper.update(user, queryWrapper); + this.lambdaUpdate().eq(User::getUsername, username).set(User::getLastLoginTime, new Date()).update(); } @Override @@ -186,8 +181,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us String password = ShaHashUtils.encrypt(salt, newPassword); user.setSalt(salt); user.setPassword(password); - LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<User>().eq(User::getUsername, username); - this.baseMapper.update(user, queryWrapper); + this.lambdaUpdate().eq(User::getUsername, username).update(user); return newPassword; }
