diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/TaskInput.java b/cloud-task-common/src/main/java/com/muyu/common/domian/TaskInput.java index f015f4c..6451d64 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/TaskInput.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/TaskInput.java @@ -71,7 +71,7 @@ public class TaskInput extends BaseEntity { /** * 字段规则 */ - private String fieIdAsEngineId; + private Long fieIdAsEngineId; public static TaskInputResp build(TaskInput node) { return TaskInputResp.builder() diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/TaskOutput.java b/cloud-task-common/src/main/java/com/muyu/common/domian/TaskOutput.java index b51bffb..b709a8b 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/TaskOutput.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/TaskOutput.java @@ -20,4 +20,6 @@ public class TaskOutput { private Long taskId; private String newFieName; private String lastFieName; + private Long tableId; + private Long basicId; } diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/req/TaskInputUpdReq.java b/cloud-task-common/src/main/java/com/muyu/common/domian/req/TaskInputUpdReq.java index 1dbd1f1..077c157 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/req/TaskInputUpdReq.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/req/TaskInputUpdReq.java @@ -54,5 +54,5 @@ public class TaskInputUpdReq { /** * 字段规则 */ - private String fieIdAsEngineId; + private Long fieIdAsEngineId; } diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/resp/TaskInputResp.java b/cloud-task-common/src/main/java/com/muyu/common/domian/resp/TaskInputResp.java index d3a28a3..6f21669 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/resp/TaskInputResp.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/resp/TaskInputResp.java @@ -60,5 +60,5 @@ public class TaskInputResp { /** * 字段规则 */ - private String fieIdAsEngineId; + private Long fieIdAsEngineId; } diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/vo/TableVo.java b/cloud-task-common/src/main/java/com/muyu/common/domian/vo/TableVo.java index 3209eb9..bebbb72 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/vo/TableVo.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/vo/TableVo.java @@ -25,5 +25,5 @@ public class TableVo { /** * 字段规则 */ - private String fieIdAsEngineId; + private Long fieIdAsEngineId; } 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 f2750a4..5dd1c53 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 @@ -10,6 +10,7 @@ import com.muyu.common.domain.DataValue; import com.muyu.common.domian.NodeJoint; import com.muyu.common.domian.TaskInfo; import com.muyu.common.domian.TaskInput; +import com.muyu.common.domian.TaskOutput; import com.muyu.common.domian.req.TaskInfoListReq; import com.muyu.common.domian.resp.TaskInfoResp; import com.muyu.remote.feign.DatasourceFeign; @@ -17,11 +18,13 @@ import com.muyu.task.server.mapper.TaskInfoMapper; import com.muyu.task.server.service.NodeJointService; import com.muyu.task.server.service.TaskInfoService; import com.muyu.task.server.service.TaskInputService; +import com.muyu.task.server.service.TaskOutputService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -39,6 +42,10 @@ public class TaskInfoServiceImpl extends ServiceImpl i @Autowired private NodeJointService nodeJointService; + @Autowired + private TaskOutputService taskOutputService; + + @Autowired private DatasourceFeign datasourceFeign; @@ -73,10 +80,14 @@ public class TaskInfoServiceImpl extends ServiceImpl i return "没有选择字段"; } String fieName = ""; + HashMap hashMap = new HashMap<>(); for (int i = 0; i < list.size(); i++) { fieName += "," + list.get(i).getTableAsFieId(); Long databaseId = list.get(i).getDatabaseId(); longs.add(databaseId); + String tableFieId = list.get(i).getTableFieId(); + Long fieIdAsEngineId = list.get(i).getFieIdAsEngineId(); + hashMap.put(tableFieId,fieIdAsEngineId); } if (longs.size() > 1) { return "你选择的不是同一个数据库"; @@ -112,10 +123,22 @@ public class TaskInfoServiceImpl extends ServiceImpl i String sql = " SELECT " + fieName + " FROM "+ joint; System.out.println(sql); Result>> tableValueResult = datasourceFeign.findTableValue(basicId, sql); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("task_id", taskId); + List list1 = taskOutputService.list(queryWrapper); + HashMap map = new HashMap<>(); + for (TaskOutput taskOutput : list1) { + String lastFieName = taskOutput.getLastFieName(); + String newFieName = taskOutput.getNewFieName(); + map.put(lastFieName, newFieName); + } List> tableValue = tableValueResult.getData(); for (List dataValues : tableValue) { - System.out.println(dataValues); + } - return null; + + + + return "执行成功"; } }