From 3696f53e31582de200d71c1649da8be160a39871 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: Wed, 4 Sep 2024 12:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quest/service/impl/TaskServiceImpl.java   |  9 +++++++--
 .../java/com/muyu/quest/utils/NodeUtils.java  | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

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 e2538c7..893c875 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
@@ -191,6 +191,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
                     throw new TaskException("数据输出节点必须紧跟在数据输入/操作节点之后");
                 }
                 // 执行查询语句
+                log.info("任务执行查询阶段结束,查询sql为: [{}]", findSql);
                 Result<List<DataModel>> tableValue = remoteDataSourceService.findTableValue(new DataValueModel(4L, findSql));
                 if (tableValue.getCode() != 200){
                     throw new TaskException(tableValue.getMsg());
@@ -201,9 +202,13 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
                 addSql = NodeUtils.nodeDispExportation(dispList, data);
             }
         }
-        log.info("任务执行结束,最终sql为: [{}]",addSql+" "+findSql);
 
-        return findSql;
+        log.info("任务执行完成,新增sql为: [{}]", addSql);
+        Result<List<DataModel>> tableValue = remoteDataSourceService.findTableValue(new DataValueModel(4L, addSql));
+        if (tableValue.getCode() != 200){
+            throw new TaskException(tableValue.getMsg());
+        }
+        return "执行成功";
     }
 
 
diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java b/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java
index 7d87f44..ea04056 100644
--- a/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java
+++ b/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java
@@ -269,14 +269,17 @@ public class NodeUtils {
             }
             dataMap.put(data.get(i).getKey(), data.get(i).getValue().toString());
         }
-        dataList1.forEach(map -> {
-            insSql.append("( ");
-            for (NodeDisposition disposition : fieldList) {
-                insSql.append("'").append(map.get(disposition.getDispDesc())).append("',");
-            }
-            insSql.append(" )");
-        });
-        return insSql.toString();
+        dataList1.forEach(map -> insSql.append(
+                "( " +
+                StringUtils.join(
+                        fieldList.
+                                stream().
+                                map(field -> map.get(field.getDispDesc())).
+                                map(field -> "'" + field + "'").
+                                toArray(),
+                        ",") +
+                " ),"));
+        return insSql.deleteCharAt(insSql.length() - 1).toString();
     }
 
 }