diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java b/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java index b61ff7d..19609e4 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java @@ -118,22 +118,25 @@ public class NodeController extends BaseController { * 删除节点管理 */ // @RequiresPermissions("quest:node:remove") - @DeleteMapping("/{ids}/{taskCode}") + @DeleteMapping("/{ids}") @Transactional - public Result remove(@PathVariable("ids") Long[] ids, @PathVariable("taskCode") String taskCode) { -// // 节点id批量查询 -// List list = nodeService.selectNodeByIds(ids); -// // 删除相关中间表信息信息 -// list.forEach(node -> { -// HashMap map = new HashMap<>(); -// map.put("node_code",node.getNodeCode()); -// map.put("task_code",taskCode); -// middleService.removeByMap(map); -// }); + public Result removeByIds(@PathVariable("ids") Long[] ids) { nodeService.removeBatchByIds(Arrays.asList(ids)); return success(); } + @DeleteMapping("/{taskCode}/{nodeCodes}") + @Transactional + public Result removeByTaskCode(@PathVariable("nodeCodes") String[] nodeCodes, @PathVariable("taskCode") String taskCode) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Node::getTaskCode,taskCode); + if (!Arrays.asList(nodeCodes).isEmpty()){ + queryWrapper.eq(Node::getNodeCode,nodeCodes); + } + nodeService.remove(queryWrapper); + return success(); + } + /** * 节点批量删除再批量新增 */