优化任务,节点,节点配置的删除逻辑

muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java

@@ -138,9 +138,8 @@ public class NodeController extends BaseController {
     @Transactional
     public Result<Integer> batch(@Validated @RequestBody ArrayList<Node> nodeList,@PathVariable("taskCode") String taskCode) {
         // 批量删除
-        LambdaQueryWrapper<Node> queryWrapper = new LambdaQueryWrapper<>();
+        nodeService.batchDelect(taskCode);
-        queryWrapper.eq(Node::getTaskCode,taskCode);
+
-        nodeService.remove(queryWrapper);
         if (nodeList.isEmpty()){
             return Result.success();
         }

muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeDispositionController.java

@@ -122,10 +122,8 @@ public class NodeDispositionController extends BaseController
     public Result<Integer> batch(
             @Validated @RequestBody ArrayList<NodeDisposition> dispList,
             @PathVariable("nodeCode") String nodeCode){
-        // 根据节点id删除
+        // 根据节点编码删除
-        LambdaQueryWrapper<NodeDisposition> queryWrapper = new LambdaQueryWrapper<>();
+        nodeDispositionService.batchDelect(nodeCode);
-        queryWrapper.eq(NodeDisposition::getNodeCode, nodeCode);
-        nodeDispositionService.remove(queryWrapper);
         // 批量新增
         if (!dispList.isEmpty()) {
             nodeDispositionService.saveBatch(dispList);

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();
     }
 

muyu-quest-server/src/main/java/com/muyu/quest/service/INodeDispositionService.java

@@ -35,4 +35,6 @@ public interface INodeDispositionService extends IService<NodeDisposition> {
     Boolean checkIdUnique(NodeDisposition nodeDisposition);
 
     Boolean checkDispUnique(NodeDisposition disp);
+
+    void batchDelect(String nodeCode);
 }

muyu-quest-server/src/main/java/com/muyu/quest/service/INodeService.java

@@ -36,4 +36,6 @@ public interface INodeService extends IService<Node> {
     Boolean checkIdUnique(Node node);
 
     List<Node> selectNodeByIds(Long[] ids);
+
+    void batchDelect(String taskCode);
 }

muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java

@@ -41,4 +41,6 @@ public interface TaskService extends IService<Task> {
      * @return 结果
      */
     Boolean checkIdUnique(Task task);
+
+    void removeBatch(List<Long> list);
 }

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<NodeDisposition> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(NodeDisposition::getNodeCode, nodeCode);
+        this.remove(queryWrapper);
+    }
+
 }

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<NodeMapper, Node>
         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<Node> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Node::getTaskCode,taskCode);
+        this.remove(queryWrapper);
+    }
+
 
 }

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<TaskMapper, Task>
         implements TaskService {
+    @Resource
+    private INodeService nodeService;
 
     /**
      * 查询任务
@@ -72,6 +77,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
         return this.exists(queryWrapper);
     }
 
+    @Override
+    public void removeBatch(List<Long> list) {
+        list.forEach(id -> nodeService.batchDelect(selectTaskById(id).getTaskCode()));
+        this.removeBatchByIds(list);
+    }
+
     /**
      * 查询任务列表
      *