From ef14392a40f9bbb6abbbb1a8300b20292bf1b810 Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Sun, 1 Sep 2024 15:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/muyu/task/server/mapper/TaskInputMapper.java    | 3 +++
 .../muyu/task/server/service/impl/TaskInputServiceImpl.java  | 5 ++---
 .../src/main/resources/mapper/TaskInputMapper.xml            | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/mapper/TaskInputMapper.java b/cloud-task-server/src/main/java/com/muyu/task/server/mapper/TaskInputMapper.java
index 9586d17..80efede 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/server/mapper/TaskInputMapper.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/server/mapper/TaskInputMapper.java
@@ -10,5 +10,8 @@ public interface TaskInputMapper extends BaseMapper<TaskInput> {
 
     TaskInput selectByNodeId(String oneNodeId);
 
+
     TaskInput selectByTaskId(Long taskId);
+
+    Long selectByBasicId(Long taskId);
 }
diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInputServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInputServiceImpl.java
index 7da378e..170cab1 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInputServiceImpl.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInputServiceImpl.java
@@ -91,12 +91,11 @@ public class TaskInputServiceImpl extends ServiceImpl<TaskInputMapper, TaskInput
             String tableAsName = taskInput.getTableAsName();
             joint=" "+tableName+" "+tableAsName;
         }
-        TaskInput taskInput = taskInputMapper.selectByTaskId(taskId);
-        Long databaseId = taskInput.getDatabaseId();
+        Long basicId = taskInputMapper.selectByBasicId(taskId);
         fieName = fieName.substring(1);
         String sql="select "+fieName + "  form "+joint;
         System.out.println("select "+fieName + "  from "+joint);
-        Result<List<List<DataValue>>> tableValue = datasourceFeign.findTableValue(databaseId, sql);
+        Result<List<List<DataValue>>> tableValue = datasourceFeign.findTableValue(basicId, sql);
         System.out.println(tableValue);
         return null;
     }
diff --git a/cloud-task-server/src/main/resources/mapper/TaskInputMapper.xml b/cloud-task-server/src/main/resources/mapper/TaskInputMapper.xml
index 1440e02..7ccc283 100644
--- a/cloud-task-server/src/main/resources/mapper/TaskInputMapper.xml
+++ b/cloud-task-server/src/main/resources/mapper/TaskInputMapper.xml
@@ -10,6 +10,11 @@
          where node_id =${nodeId}
     </select>
     <select id="selectByTaskId" resultType="com.muyu.common.domian.TaskInput">
+        SELECT DISTINCT database_id
+        FROM etl_task_input e left join table_info t on e.database_id=t.id
+        where task_id =${taskId}
+    </select>
+    <select id="selectByBasicId" resultType="java.lang.Long">
         SELECT DISTINCT basic_id
         FROM etl_task_input e left join table_info t on e.database_id=t.id
         where task_id =${taskId}