diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtAggregationTaskController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtAggregationTaskController.java index c0b738b..9f8a942 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtAggregationTaskController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtAggregationTaskController.java @@ -169,8 +169,24 @@ public class UsdtAggregationTaskController extends BaseController { return AjaxResult.success(usdtAggregationTaskService.selectUsdtAggregationTaskById(id, true)); } + @PreAuthorize("@ss.hasPermi('system:usdtTask:remove')") + @Log(title = "归集任务", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public AjaxResult remove(@PathVariable("id") Long id) { + aggregationWorkflowService.deleteTask(id, false); + return AjaxResult.success("删除成功"); + } + + @PreAuthorize("@ss.hasPermi('system:usdtTask:user-remove')") + @Log(title = "用户归集任务", businessType = BusinessType.DELETE) + @DeleteMapping("/user/{id}") + public AjaxResult userRemove(@PathVariable("id") Long id) { + aggregationWorkflowService.deleteTask(id, true); + return AjaxResult.success("删除成功"); + } + /* * 归集任务的状态、审核结果、目标地址和执行时间必须由工作流维护。 - * 不暴露代码生成器的通用新增、编辑和删除接口,防止绕过审核流程。 + * 不暴露代码生成器的通用新增和编辑接口;删除必须经过受控状态校验。 */ } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtAggregationTaskMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtAggregationTaskMapper.java index ff6f8d9..85fd739 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtAggregationTaskMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtAggregationTaskMapper.java @@ -23,6 +23,9 @@ public interface UsdtAggregationTaskMapper extends BaseMapper() + .eq(UsdtAggregationTaskItemPlus::getParentId, taskId) + .isNull(UsdtAggregationTaskItemPlus::getDeletedAt) + .set(UsdtAggregationTaskItemPlus::getDeletedAt, now) + .set(UsdtAggregationTaskItemPlus::getUpdatedAt, now)); + } + public void executeTask(Long taskId, String password, boolean userMode) { UsdtAggregationTaskPlus task = requireTask(taskId, userMode); if (!Integer.valueOf(1).equals(task.getVerifyStatus())) { @@ -274,7 +299,7 @@ public class UsdtAggregationWorkflowService { private UsdtAggregationTaskPlus requireTask(Long taskId, boolean userMode) { UsdtAggregationTaskPlus task = taskService.getById(taskId); - if (task == null) { + if (task == null || task.getDeletedAt() != null) { throw new CustomException("归集任务不存在"); } if (userMode && !SecurityUtils.getUserId().equals(task.getUserId())) { diff --git a/ruoyi-system/src/main/resources/mapper/system/UsdtAggregationTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UsdtAggregationTaskMapper.xml index 2ed35c1..3035699 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UsdtAggregationTaskMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UsdtAggregationTaskMapper.xml @@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} + where id = #{id} and deleted_at is null + + +