From e76fc4d2dbd60ad1a06ace44b6a9709f698c6413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Thu, 29 Aug 2024 20:28:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1,=E8=8A=82?= =?UTF-8?q?=E7=82=B9,=E8=8A=82=E7=82=B9=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/quest/controller/NodeController.java | 5 ++--- .../controller/NodeDispositionController.java | 6 ++---- .../muyu/quest/controller/TaskController.java | 2 +- .../quest/service/INodeDispositionService.java | 2 ++ .../com/muyu/quest/service/INodeService.java | 2 ++ .../java/com/muyu/quest/service/TaskService.java | 2 ++ .../service/impl/NodeDispositionServiceImpl.java | 7 +++++++ .../muyu/quest/service/impl/NodeServiceImpl.java | 16 ++++++++++++++++ .../muyu/quest/service/impl/TaskServiceImpl.java | 11 +++++++++++ 9 files changed, 45 insertions(+), 8 deletions(-) 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 9bf637f..e20fe91 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 @@ -138,9 +138,8 @@ public class NodeController extends BaseController { @Transactional public Result batch(@Validated @RequestBody ArrayList nodeList,@PathVariable("taskCode") String taskCode) { // 批量删除 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Node::getTaskCode,taskCode); - nodeService.remove(queryWrapper); + nodeService.batchDelect(taskCode); + if (nodeList.isEmpty()){ return Result.success(); } diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeDispositionController.java b/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeDispositionController.java index 9ff4d20..ee7ace9 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeDispositionController.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeDispositionController.java @@ -122,10 +122,8 @@ public class NodeDispositionController extends BaseController public Result batch( @Validated @RequestBody ArrayList dispList, @PathVariable("nodeCode") String nodeCode){ - // 根据节点id删除 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(NodeDisposition::getNodeCode, nodeCode); - nodeDispositionService.remove(queryWrapper); + // 根据节点编码删除 + nodeDispositionService.batchDelect(nodeCode); // 批量新增 if (!dispList.isEmpty()) { nodeDispositionService.saveBatch(dispList); 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 efb7904..a676c49 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 @@ -103,7 +103,7 @@ public class TaskController extends BaseController // @RequiresPermissions("system:task:remove") @DeleteMapping("/{taskIds}") public Result remove (@PathVariable("taskIds") Long[] taskIds) { - taskService.removeBatchByIds(Arrays.asList(taskIds)); + taskService.removeBatch(Arrays.asList(taskIds)); return success(); } diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/INodeDispositionService.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/INodeDispositionService.java index b09c572..c8690ad 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/service/INodeDispositionService.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/INodeDispositionService.java @@ -35,4 +35,6 @@ public interface INodeDispositionService extends IService { Boolean checkIdUnique(NodeDisposition nodeDisposition); Boolean checkDispUnique(NodeDisposition disp); + + void batchDelect(String nodeCode); } diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/INodeService.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/INodeService.java index 9487d17..d8022d2 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/service/INodeService.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/INodeService.java @@ -36,4 +36,6 @@ public interface INodeService extends IService { Boolean checkIdUnique(Node node); List selectNodeByIds(Long[] ids); + + void batchDelect(String taskCode); } 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 ccfab0e..3f08b08 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 @@ -41,4 +41,6 @@ public interface TaskService extends IService { * @return 结果 */ Boolean checkIdUnique(Task task); + + void removeBatch(List list); } diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeDispositionServiceImpl.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeDispositionServiceImpl.java index a90fc40..9d6868c 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeDispositionServiceImpl.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeDispositionServiceImpl.java @@ -82,4 +82,11 @@ public class NodeDispositionServiceImpl return this.exists(queryWrapper); } + @Override + public void batchDelect(String nodeCode) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(NodeDisposition::getNodeCode, nodeCode); + this.remove(queryWrapper); + } + } diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeServiceImpl.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeServiceImpl.java index 19cc253..36605be 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeServiceImpl.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeServiceImpl.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import com.muyu.quest.req.NodeReq; +import com.muyu.quest.service.INodeDispositionService; import org.springframework.stereotype.Service; import com.muyu.quest.mapper.NodeMapper; import com.muyu.quest.domain.Node; @@ -13,6 +14,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import org.springframework.util.Assert; +import javax.annotation.Resource; + /** * 节点管理Service业务层处理 * @@ -23,6 +26,8 @@ import org.springframework.util.Assert; public class NodeServiceImpl extends ServiceImpl implements INodeService { + @Resource + private INodeDispositionService dispositionService; /** * 精确查询节点管理 @@ -87,5 +92,16 @@ public class NodeServiceImpl return this.list(queryWrapper); } + @Override + public void batchDelect(String taskCode) { + // 查询任务所有节点 + NodeReq nodeReq = new NodeReq(); + nodeReq.setTaskCode(taskCode); + selectNodeList(nodeReq).forEach(node -> dispositionService.removeById(node.getNodeCode())); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Node::getTaskCode,taskCode); + this.remove(queryWrapper); + } + } 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 eac72ff..b654b44 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 @@ -7,12 +7,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.quest.req.TaskReq; import com.muyu.quest.resp.TaskResp; +import com.muyu.quest.service.INodeService; import org.springframework.stereotype.Service; import com.muyu.quest.mapper.TaskMapper; import com.muyu.quest.domain.Task; import com.muyu.quest.service.TaskService; import org.springframework.util.Assert; +import javax.annotation.Resource; + /** * 任务Service业务层处理 * @@ -22,6 +25,8 @@ import org.springframework.util.Assert; @Service public class TaskServiceImpl extends ServiceImpl implements TaskService { + @Resource + private INodeService nodeService; /** * 查询任务 @@ -72,6 +77,12 @@ public class TaskServiceImpl extends ServiceImpl return this.exists(queryWrapper); } + @Override + public void removeBatch(List list) { + list.forEach(id -> nodeService.batchDelect(selectTaskById(id).getTaskCode())); + this.removeBatchByIds(list); + } + /** * 查询任务列表 *