From 99262e667fcd4df379253cb6549dc92e07cb96d5 Mon Sep 17 00:00:00 2001
From: panbaolin <panbaolin@1.com>
Date: Mon, 10 Aug 2026 10:28:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:1.=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E9=85=8D=E5=90=88=E5=89=8D=E7=AB=AF=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StasTaskConfigServiceImpl.java       | 31 +++++++------------
 .../main/java/org/jeecg/vo/TableInfoVO.java   |  1 +
 2 files changed, 12 insertions(+), 20 deletions(-)

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<StasTaskConfigMapper,
      */
     @Override
     public MindMapVO getMindMap(String taskId) {
-        // 1. 使用多线程并行查询数据库
-        CompletableFuture<StasTaskConfig> taskConfigFuture = CompletableFuture.supplyAsync(() ->
-                stasTaskConfigMapper.selectById(taskId));
+        StasTaskConfig stasTaskConfig = stasTaskConfigMapper.selectById(taskId);
+        if(Objects.isNull(stasTaskConfig)) {
+            throw new RuntimeException("此任务不存在");
+        }
+        LambdaQueryWrapper<StasSyncStrategy> strategyQueryWrapper = new LambdaQueryWrapper<>();
+        strategyQueryWrapper.eq(StasSyncStrategy::getTaskId, taskId);
+        List<StasSyncStrategy> syncStrategies = stasSyncStrategyMapper.selectList(strategyQueryWrapper);
 
-        CompletableFuture<List<StasSyncStrategy>> strategiesFuture = taskConfigFuture.thenApplyAsync(config ->
-                stasSyncStrategyMapper.selectList(
-                        new LambdaQueryWrapper<StasSyncStrategy>()
-                                .eq(StasSyncStrategy::getTaskId, taskId)));
-
-        CompletableFuture<StasDataSource> dataSourceFuture = taskConfigFuture.thenApplyAsync(config ->
-                stasDataSourceMapper.selectById(config.getSourceId()));
-
-        // 2. 等待所有查询完成
-        CompletableFuture.allOf(taskConfigFuture, strategiesFuture, dataSourceFuture).join();
-
-        // 3. 构建响应对象
-        StasDataSource sourceInfo = dataSourceFuture.join();
-        List<StasSyncStrategy> stasSyncStrategies = strategiesFuture.join();
+        StasDataSource stasDataSource = stasDataSourceMapper.selectById(stasTaskConfig.getSourceId());
 
         MindMapVO mindMapVO = new MindMapVO();
-        mindMapVO.setDatabaseName(sourceInfo.getInstanceName());
+        mindMapVO.setDatabaseName(stasDataSource.getInstanceName());
 
-        // 4. 使用流式处理简化代码
-        List<UserInfoVO> userInfos = stasSyncStrategies.stream()
+        List<UserInfoVO> userInfos = syncStrategies.stream()
                 .collect(Collectors.groupingBy(StasSyncStrategy::getSourceOwner))
                 .entrySet().stream()
                 .map(entry -> {
@@ -84,6 +74,7 @@ public class StasTaskConfigServiceImpl extends ServiceImpl<StasTaskConfigMapper,
                                 TableInfoVO tableInfoVO = new TableInfoVO();
                                 tableInfoVO.setTableName(strategy.getTableName());
                                 tableInfoVO.setColumnName(strategy.getColumnName());
+                                tableInfoVO.setSyncCount(strategy.getSyncCount());
                                 return tableInfoVO;
                             })
                             .collect(Collectors.toList());
diff --git a/jeecg-module-sync/src/main/java/org/jeecg/vo/TableInfoVO.java b/jeecg-module-sync/src/main/java/org/jeecg/vo/TableInfoVO.java
index 4492767..4f794a3 100644
--- a/jeecg-module-sync/src/main/java/org/jeecg/vo/TableInfoVO.java
+++ b/jeecg-module-sync/src/main/java/org/jeecg/vo/TableInfoVO.java
@@ -6,4 +6,5 @@ import lombok.Data;
 public class TableInfoVO {
     private String tableName;
     private String columnName;
+    private Integer syncCount;
 }