diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java b/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java index b06c313..e067b38 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.UUID; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.quest.domain.Node; import com.muyu.quest.domain.Task; import javax.annotation.Resource; @@ -113,9 +114,9 @@ public class TaskController extends BaseController /** * 测试任务 */ - @PostMapping("/testExecute/{taskCode}") - public Result testExecute(@PathVariable("taskCode") String taskCode) { - return success(taskService.testExecute(taskCode)); + @PostMapping("/testExecute") + public Result testExecute(@RequestBody List nodeList) { + return success(taskService.testExecute(nodeList)); } /** diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java index 3044989..f7823a4 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java @@ -3,6 +3,7 @@ package com.muyu.quest.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.quest.domain.Node; import com.muyu.quest.domain.Task; import com.muyu.quest.req.TaskReq; import com.muyu.quest.resp.TaskResp; @@ -46,5 +47,5 @@ public interface TaskService extends IService { String execute(String taskCode); - String testExecute(String taskCode); + String testExecute(List nodeList); } 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 290a4fe..743c806 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 @@ -199,17 +199,9 @@ public class TaskServiceImpl extends ServiceImpl } @Override - public String testExecute(String taskCode) { - log.info("任务编码 {} 开始测试执行......",taskCode); - // 查询SQL语句 - String findSql = ""; - // 新增SQL语句 - String addSql = ""; - - // 查询任务所有节点 - List nodeListAll = nodeService.selectNodeList(new NodeReq().buildTaskCode(taskCode)); - // 节点初始化 - HashMap> nodeMap = NodeUtils.nodeInit(nodeListAll); + public String testExecute(List nodeListAll) { + log.info("开始测试执行......"); + // 查询节点类型与其规范 List nodeTypeList = selectNodeTypeList(); /* 节点组成校验 */ NodeUtils.nodeCheckMakeUp(nodeListAll, nodeTypeList);