From 89fc58a0e73cdbd0b6b07aca209a39fc128b3014 Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Mon, 2 Sep 2024 19:27:49 +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

---
 .../task/server/service/TaskInfoService.java  |  2 +-
 .../task/server/service/TaskInputService.java |  2 +-
 .../service/impl/TaskInfoServiceImpl.java     | 55 ++++++++++++++++++
 .../service/impl/TaskInputServiceImpl.java    | 57 -------------------
 4 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInfoService.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInfoService.java
index dfafdfb..9e5126d 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInfoService.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInfoService.java
@@ -13,5 +13,5 @@ import com.muyu.common.domian.resp.TaskInfoResp;
 public interface TaskInfoService extends IService<TaskInfo> {
     Page<TaskInfoResp> selectList(TaskInfoListReq req);
 
-
+    String findByFieName(Long taskId);
 }
diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInputService.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInputService.java
index be7afa6..6197111 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInputService.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInputService.java
@@ -8,7 +8,7 @@ import com.muyu.common.domian.req.TaskInputListReq;
 public interface TaskInputService extends IService<TaskInput> {
     Page<TaskInput> findList(TaskInputListReq req);
 
-    String findByFieName(Long taskId);
+
 
     TaskInput selectByNodeId(String oneNodeId);
 
diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
index 63af08b..f2750a4 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
@@ -63,4 +63,59 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
         return respPage;
     }
 
+    @Override
+    public String findByFieName(Long taskId) {
+        QueryWrapper<TaskInput> wrapper = new QueryWrapper<>();
+        wrapper.eq("task_id", taskId);
+        HashSet<Long> longs = new HashSet<>();
+        List<TaskInput> list = taskInputService.list(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return "没有选择字段";
+        }
+        String fieName = "";
+        for (int i = 0; i < list.size(); i++) {
+            fieName += "," + list.get(i).getTableAsFieId();
+            Long databaseId = list.get(i).getDatabaseId();
+            longs.add(databaseId);
+        }
+        if (longs.size() > 1) {
+            return "你选择的不是同一个数据库";
+        }
+        QueryWrapper<NodeJoint> jointQueryWrapper = new QueryWrapper<>();
+        jointQueryWrapper.eq("task_id", taskId);
+        List<NodeJoint> jointList = nodeJointService.list(jointQueryWrapper);
+        String joint = "";
+        if (!CollectionUtils.isEmpty(jointList)) {
+            for (NodeJoint nodeJoint : jointList) {
+                String oneNodeId = nodeJoint.getOneNodeId();
+                TaskInput taskInput = taskInputService.selectByNodeId(oneNodeId);
+                String tableName = taskInput.getTableName();
+                String tableAsName = taskInput.getTableAsName();
+
+                String twoNodeId = nodeJoint.getTwoNodeId();
+                TaskInput taskInputTwo = taskInputService.selectByNodeId(twoNodeId);
+                String tableNameTwo = taskInputTwo.getTableName();
+                String tableAsNameTwo = taskInputTwo.getTableAsName();
+                joint += " " + tableName + " " + " " + tableAsName + " " + nodeJoint.getJoint()
+                        + " " + tableNameTwo + " " + " " + tableAsNameTwo + " on " + nodeJoint.getOneFie()
+                        + " = " + nodeJoint.getTwoFie();
+
+            }
+        }else {
+            TaskInput taskInput = taskInputService.selectByTaskId(taskId);
+            String tableName = taskInput.getTableName();
+            String tableAsName = taskInput.getTableAsName();
+            joint=" "+ tableName+" "+tableAsName;
+        }
+        Long basicId = taskInputService.selectByBasicId(taskId);
+        fieName = fieName.substring(1);
+        String sql = " SELECT " + fieName + " FROM "+ joint;
+        System.out.println(sql);
+        Result<List<List<DataValue>>> tableValueResult = datasourceFeign.findTableValue(basicId, sql);
+        List<List<DataValue>> tableValue = tableValueResult.getData();
+        for (List<DataValue> dataValues : tableValue) {
+            System.out.println(dataValues);
+        }
+        return null;
+    }
 }
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 bac367e..b3795cd 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
@@ -46,63 +46,6 @@ public class TaskInputServiceImpl extends ServiceImpl<TaskInputMapper, TaskInput
         return this.page(page, wrapper);
     }
 
-
-    @Override
-    public String findByFieName(Long taskId) {
-        QueryWrapper<TaskInput> wrapper = new QueryWrapper<>();
-        wrapper.eq("task_id", taskId);
-        HashSet<Long> longs = new HashSet<>();
-        List<TaskInput> list = taskInputMapper.selectList(wrapper);
-        if (CollectionUtils.isEmpty(list)) {
-            return "没有选择字段";
-        }
-        String fieName = "";
-        for (int i = 0; i < list.size(); i++) {
-            fieName += "," + list.get(i).getTableAsFieId();
-            Long databaseId = list.get(i).getDatabaseId();
-            longs.add(databaseId);
-        }
-        if (longs.size() > 1) {
-            return "你选择的不是同一个数据库";
-        }
-        QueryWrapper<NodeJoint> jointQueryWrapper = new QueryWrapper<>();
-        jointQueryWrapper.eq("task_id", taskId);
-        List<NodeJoint> jointList = nodeJointService.list(jointQueryWrapper);
-        String joint = "";
-        if (!CollectionUtils.isEmpty(jointList)){
-            for (NodeJoint nodeJoint : jointList) {
-                String oneNodeId = nodeJoint.getOneNodeId();
-                TaskInput taskInput = taskInputMapper.selectByNodeId(oneNodeId);
-                String tableName = taskInput.getTableName();
-                String tableAsName = taskInput.getTableAsName();
-
-                String twoNodeId = nodeJoint.getTwoNodeId();
-                TaskInput taskInputTwo = taskInputMapper.selectByNodeId(twoNodeId);
-                String tableNameTwo = taskInputTwo.getTableName();
-                String tableAsNameTwo = taskInputTwo.getTableAsName();
-
-                joint += " " + tableName + " " + " " + tableAsName + " " + nodeJoint.getJoint() + " " + tableNameTwo + " " + " " + tableAsNameTwo + " "
-                        + " on " +nodeJoint.getOneFie() +"="+nodeJoint.getTwoFie();
-
-            }
-        }else {
-            TaskInput taskInput = taskInputMapper.selectByTaskId(taskId);
-            String tableName = taskInput.getTableName();
-            String tableAsName = taskInput.getTableAsName();
-            joint=" "+tableName+" "+tableAsName;
-        }
-        Long basicId = taskInputMapper.selectByBasicId(taskId);
-        fieName = fieName.substring(1);
-        String sql="select "+fieName + "  from "+joint;
-        System.out.println("select "+fieName + "  from "+joint);
-        Result<List<List<DataValue>>> tableValue = datasourceFeign.findTableValue(basicId, sql);
-        System.out.println(tableValue);
-
-
-
-        return null;
-    }
-
     @Override
     public TaskInput selectByNodeId(String oneNodeId) {
         return taskInputMapper.selectByNodeId(oneNodeId);