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 5f716c7..d647b53 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 @@ -1,9 +1,6 @@ package com.muyu.quest.controller; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; +import java.util.*; import com.muyu.common.core.enums.SysDBType; import com.muyu.quest.domain.TaskNodeMiddle; @@ -40,8 +37,7 @@ import com.muyu.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/node") -public class NodeController extends BaseController -{ +public class NodeController extends BaseController { @Resource private INodeService nodeService; @Resource @@ -52,8 +48,7 @@ public class NodeController extends BaseController */ // @RequiresPermissions("quest:node:list") @GetMapping("/list") - public Result> list(NodeReq nodeReq) - { + public Result> list(NodeReq nodeReq) { startPage(); List list = nodeService.selectNodeList(nodeReq); return getDataTable(list @@ -67,8 +62,7 @@ public class NodeController extends BaseController */ // @RequiresPermissions("quest:node:export") @PostMapping("/export") - public void export(HttpServletResponse response, NodeReq nodeReq) - { + public void export(HttpServletResponse response, NodeReq nodeReq) { List list = nodeService.selectNodeList(nodeReq); ExcelUtil util = new ExcelUtil(Node.class); util.exportExcel(response, list, "节点管理数据"); @@ -79,8 +73,7 @@ public class NodeController extends BaseController */ // @RequiresPermissions("quest:node:query") @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { + public Result> getInfo(@PathVariable("id") Long id) { return success(nodeService.selectNodeById(id)); } @@ -95,7 +88,7 @@ public class NodeController extends BaseController if (nodeService.checkIdUnique(node)) { return error("新增 节点管理 '" + node + "'失败,节点已存在"); } - String code = UUID.randomUUID().toString().replace("-",""); + String code = UUID.randomUUID().toString().replace("-", ""); node.setNodeCode(code); node.setCreateBy(SecurityUtils.getUsername()); boolean save = nodeService.save(node); @@ -112,7 +105,7 @@ public class NodeController extends BaseController // @RequiresPermissions("quest:node:edit") @PutMapping public Result edit( - @Validated @RequestBody Node node){ + @Validated @RequestBody Node node) { if (!nodeService.checkIdUnique(node)) { return error("修改 节点管理 '" + node + "'失败,节点不存在"); } @@ -124,20 +117,34 @@ public class NodeController extends BaseController * 删除节点管理 */ // @RequiresPermissions("quest:node:remove") - @DeleteMapping("/{ids}/{taskCode}") + @DeleteMapping("/{ids}/{taskCode}") @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 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); +// }); nodeService.removeBatchByIds(Arrays.asList(ids)); return success(); } + + /** + * 节点批量删除再批量新增 + */ + @PostMapping("/batch") + @Transactional + public Result batch(@Validated @RequestBody ArrayList nodeList) { + ArrayList ids = new ArrayList<>(); + nodeList.forEach(node -> ids.add(node.getId())); + // 批量删除 + nodeService.removeBatchByIds(ids); + // 批量添加 + boolean save = nodeService.saveBatch(nodeList); + return toAjax(save); + } }