diff --git a/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/service/impl/StasTaskConfigServiceImpl.java b/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/service/impl/StasTaskConfigServiceImpl.java index 5e70f87..36907d0 100644 --- a/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/service/impl/StasTaskConfigServiceImpl.java +++ b/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/service/impl/StasTaskConfigServiceImpl.java @@ -49,30 +49,20 @@ public class StasTaskConfigServiceImpl extends ServiceImpl taskConfigFuture = CompletableFuture.supplyAsync(() -> - stasTaskConfigMapper.selectById(taskId)); + StasTaskConfig stasTaskConfig = stasTaskConfigMapper.selectById(taskId); + if(Objects.isNull(stasTaskConfig)) { + throw new RuntimeException("此任务不存在"); + } + LambdaQueryWrapper strategyQueryWrapper = new LambdaQueryWrapper<>(); + strategyQueryWrapper.eq(StasSyncStrategy::getTaskId, taskId); + List syncStrategies = stasSyncStrategyMapper.selectList(strategyQueryWrapper); - CompletableFuture> strategiesFuture = taskConfigFuture.thenApplyAsync(config -> - stasSyncStrategyMapper.selectList( - new LambdaQueryWrapper() - .eq(StasSyncStrategy::getTaskId, taskId))); - - CompletableFuture dataSourceFuture = taskConfigFuture.thenApplyAsync(config -> - stasDataSourceMapper.selectById(config.getSourceId())); - - // 2. 等待所有查询完成 - CompletableFuture.allOf(taskConfigFuture, strategiesFuture, dataSourceFuture).join(); - - // 3. 构建响应对象 - StasDataSource sourceInfo = dataSourceFuture.join(); - List stasSyncStrategies = strategiesFuture.join(); + StasDataSource stasDataSource = stasDataSourceMapper.selectById(stasTaskConfig.getSourceId()); MindMapVO mindMapVO = new MindMapVO(); - mindMapVO.setDatabaseName(sourceInfo.getInstanceName()); + mindMapVO.setDatabaseName(stasDataSource.getInstanceName()); - // 4. 使用流式处理简化代码 - List userInfos = stasSyncStrategies.stream() + List userInfos = syncStrategies.stream() .collect(Collectors.groupingBy(StasSyncStrategy::getSourceOwner)) .entrySet().stream() .map(entry -> { @@ -84,6 +74,7 @@ public class StasTaskConfigServiceImpl extends ServiceImpl