From e25fe74342a7a6ae2150b366eafe9ed7c93bf82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Mon, 9 Sep 2024 17:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E8=B0=83=E7=94=A8=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 muyu-quest-server/pom.xml                            |  6 ++++++
 .../com/muyu/quest/service/impl/TaskServiceImpl.java | 12 +++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/muyu-quest-server/pom.xml b/muyu-quest-server/pom.xml
index 5e56f6f..b76092c 100644
--- a/muyu-quest-server/pom.xml
+++ b/muyu-quest-server/pom.xml
@@ -94,6 +94,12 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-quest-remote</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>etl-rule-remote</artifactId>
+            <version>3.6.5</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>muyu-quest</finalName>
diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java
index 7dd6c35..3f2a754 100644
--- a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java
+++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
+import com.muyu.etl.rule.remote.RemoteRuleVersion;
 import com.muyu.quest.domain.*;
 import com.muyu.quest.manager.TaskManager;
 import com.muyu.quest.model.DataModel;
@@ -49,6 +50,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
     private RemoteDataSourceService remoteDataSourceService;
     @Resource
     private ITaskExportService taskExportService;
+    @Resource
+    private RemoteRuleVersion remoteRuleVersion;
 
     private static TaskManager taskManager = null;
 
@@ -180,13 +183,13 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
             taskManager.execute(() -> {
                 String exportCode = UUID.randomUUID().toString().replace("-","");
                 // 获取新SQL 并执行
-                StringBuilder newAddSql = new StringBuilder(findSql);
-                newAddSql.append(" LIMIT ")
+                StringBuilder newFindSql = new StringBuilder(findSql);
+                newFindSql.append(" LIMIT ")
                         .append(limitNum)
                         .append(" OFFSET ")
                         .append((index-1)*limitNum);
-                String addSql = getAddSql(nodeMap, newAddSql.toString());
-                TaskExport entity = new TaskExport(taskCode,exportCode, newAddSql.toString(), 0, "");
+                String addSql = getAddSql(nodeMap, newFindSql.toString());
+                TaskExport entity = new TaskExport(taskCode,exportCode, newFindSql.toString(), 0, "");
                 taskExportService.save(entity);
                 Result addResult = remoteDataSourceService.addTableValue(new DataValueModel(4L, addSql));
                 log.info("任务 {} 第 {} 线程执行结果 {}",taskCode,index,addResult.getMsg());
@@ -270,7 +273,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
             s1[1] = "COUNT(" + s1[1].split(",")[0]+ ")";
             findCountSql = StringUtils.join(s1," ");
         }else {
-
             String[] split = s1[s1.length-1].split("\\.");
             stringBuilder.append("SELECT TABLE_ROWS ")
                     .append("FROM INFORMATION_SCHEMA.TABLES ")