From 7896f7c047cf9086de376437dd7ee8736e17e7ae Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 8 Sep 2024 02:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=BA=BF=E7=A8=8B=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/service/impl/TaskServiceImpl.java    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
index d71c492..72408d5 100644
--- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
+++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
@@ -124,15 +124,16 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
             String[] tableFieldList = taskInputList.get(i).getTableField().split(",");
             String[] tableAsFieldList = taskInputList.get(i).getTableAsField().split(",");
             for (int j = 0; j < tableAsFieldList.length; j++) {
+                fieldAsNameMap.put(tableAsFieldList[j], tableFieldList[j]);
+                fieldAsNameMap.put(tableAsFieldList[j], tableFieldList[j]);
                 for (int o = 0; o < newFileName.length; o++) {
-                    newAndOldMap.put(outPutFileName[o], newFileName[o]);
+                    newAndOldMap.put(fieldAsNameMap.get(outPutFileName[o]), newFileName[o]);
                     if(tableAsFieldList[j].equals(outPutFileName[o])){
                         sql += ","+taskInputList.get(i).getTableAsName() + "." + tableFieldList[j] +" " +
                                 tableAsFieldList[j] + " ";
                     }
                 }
-                fieldAsNameMap.put(tableAsFieldList[j], tableFieldList[j]);
-                fieldAsNameMap.put(tableAsFieldList[j], tableFieldList[j]);
+
             }
         }
 
@@ -194,7 +195,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
             Long finalDatabaseId = databaseId;
             String finalSql = sql;
             executeUrgently(() -> {
-                selectAndAdd(count, finalDatabaseId, basicId, finalSql, tableId,fieldAsNameMap);
+                selectAndAdd(count, finalDatabaseId, basicId, finalSql, tableId,newAndOldMap);
             });
         }
 
@@ -203,7 +204,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
             Long finalDatabaseId = databaseId;
             String finalSql = sql;
             executeUrgently(() -> {
-                selectAndAdd(count, finalDatabaseId, basicId, finalSql, tableId,fieldAsNameMap);
+                selectAndAdd(count, finalDatabaseId, basicId, finalSql, tableId,newAndOldMap);
             });
         }
 
@@ -212,7 +213,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
             Long finalDatabaseId = databaseId;
             String finalSql = sql;
             executeUrgently(() -> {
-                selectAndAdd(count, finalDatabaseId, basicId, finalSql, tableId,fieldAsNameMap);
+                selectAndAdd(count, finalDatabaseId, basicId, finalSql, tableId,newAndOldMap);
             });
         }
 
@@ -221,7 +222,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
             Long finalDatabaseId = databaseId;
             String finalSql = sql;
             executeUrgently(() -> {
-                selectAndAdd(count, finalDatabaseId, basicId, finalSql, tableId,fieldAsNameMap);
+                selectAndAdd(count, finalDatabaseId, basicId, finalSql, tableId,newAndOldMap);
             });
         }
 
@@ -232,7 +233,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
     }
 
     private void selectAndAdd(Integer count,Long databaseId,Long basicId,String sql,Long tableId,
-                              HashMap<String,String> fieldAsNameMap) {
+                              HashMap<String,String> newAndOldMap) {
         int pageSize = 1000;
         long firstArray = 0L;
         int totalSegments = (int) Math.ceil((double) count / pageSize);
@@ -250,10 +251,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
             List<List<DataValue>> data = (List<List<DataValue>>) tableValue.getData();
             log.info("远程调用完毕,调用数量{}",data.size());
             for (List<DataValue> datum : data) {
-                log.info(datum.toString());
                 for (DataValue dataValue : datum) {
+                    log.info(datum.toString());
                     String key = dataValue.getKey();
-                    String newKey = fieldAsNameMap.get(key);
+                    log.info("传来的值的键为{}",key);
+                    String newKey = newAndOldMap.get(key);
+                    log.info("取出来的值的键为{}",newKey);
                     log.info("新的目标字段{}",newKey);
                     log.info("通过map字段取到的值为{}", newKey);
                     dataValue.setKey(newKey);