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 6451d64..f015f4c 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 Long fieIdAsEngineId; + private String fieIdAsEngineId; public static TaskInputResp build(TaskInput node) { return TaskInputResp.builder() 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 077c157..1dbd1f1 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 Long fieIdAsEngineId; + private String 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 6f21669..d3a28a3 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 Long fieIdAsEngineId; + private String 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 bebbb72..3209eb9 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 Long fieIdAsEngineId; + private String fieIdAsEngineId; } diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/controller/TaskInputController.java b/cloud-task-server/src/main/java/com/muyu/task/server/controller/TaskInputController.java index f211b34..292aa8d 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/controller/TaskInputController.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/controller/TaskInputController.java @@ -52,21 +52,44 @@ public class TaskInputController { map.put("node_id",req.getNodeId()); taskInputService.removeByMap(map); List list = req.getList(); - List inputs = list.stream().map(inputAddReq -> { - TaskInput build = TaskInput.builder() + String tableFieId=""; + String tableAsFieId=""; + String fieIdAsEngineId=""; + for (TableVo tableVo : list) { + tableFieId += "," + tableVo.getColumnName(); + tableAsFieId += "," + tableVo.getTableAsName(); + fieIdAsEngineId += "," + tableVo.getFieIdAsEngineId(); + } + tableFieId = tableFieId.substring(1); + tableAsFieId = tableAsFieId.substring(1); + fieIdAsEngineId = fieIdAsEngineId.substring(1); + +// List inputs = list.stream().map(inputAddReq -> { +// TaskInput build = TaskInput.builder() +// .nodeId(req.getNodeId()) +// .nodeName(req.getNodeName()) +// .taskId(req.getTaskId()) +// .databaseId(req.getDatabaseId()) +// .tableName(req.getTableName()) +// .tableAsName(req.getTableAsName()) +// .tableFieId(inputAddReq.getColumnName()) +// .tableAsFieId(inputAddReq.getTableAsName()) +// .fieIdAsEngineId(inputAddReq.getFieIdAsEngineId()) +// .build(); +// return build; +// }).toList(); + TaskInput build = TaskInput.builder() .nodeId(req.getNodeId()) .nodeName(req.getNodeName()) .taskId(req.getTaskId()) .databaseId(req.getDatabaseId()) .tableName(req.getTableName()) .tableAsName(req.getTableAsName()) - .tableFieId(inputAddReq.getColumnName()) - .tableAsFieId(inputAddReq.getTableAsName()) - .fieIdAsEngineId(inputAddReq.getFieIdAsEngineId()) + .tableFieId(tableFieId) + .tableAsFieId(tableAsFieId) + .fieIdAsEngineId(fieIdAsEngineId) .build(); - return build; - }).toList(); - taskInputService.saveBatch(inputs); + taskInputService.save(build); return Result.success(); } 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 76a5504..5525b23 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 @@ -230,6 +230,8 @@ public class TaskInfoServiceImpl extends ServiceImpl i String newKey = map.get(key); dataValue.setKey(newKey); log.info(dataValue); + + } } return "执行成功";