diff --git a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/UsdtOrdersRestrictionTest.java b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/UsdtOrdersRestrictionTest.java index 3f3cf35..59d1f26 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/UsdtOrdersRestrictionTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/UsdtOrdersRestrictionTest.java @@ -24,6 +24,13 @@ public class UsdtOrdersRestrictionTest { ReflectionTestUtils.setField(service, "usdtOrdersMapper", mapper); } + @Test + public void rejectsManualCreationForBothScopes() { + rejects(() -> service.insertUsdtOrders(new UsdtOrders(), false)); + rejects(() -> service.insertUsdtOrders(new UsdtOrders(), true)); + verify(mapper, never()).insertUsdtOrders(any()); + } + @Test public void rejectsManualUpdatesForBothScopes() { rejects(() -> service.updateUsdtOrders(new UsdtOrders(), false)); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/UsdtAggregationWorkflowService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/UsdtAggregationWorkflowService.java index 0614cd8..462166d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/UsdtAggregationWorkflowService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/UsdtAggregationWorkflowService.java @@ -131,7 +131,7 @@ public class UsdtAggregationWorkflowService { taskService.updateById(task); } - /** 仅允许删除尚未执行且处于待审核或审核拒绝状态的任务。 */ + /** 仅允许删除审核拒绝且尚未执行的任务;主任务与明细同事务软删除,保留审计记录。 */ @Transactional(rollbackFor = Exception.class) public void deleteTask(Long taskId, boolean userMode) { UsdtAggregationTask task = taskMapper.selectUsdtAggregationTaskByIdForUpdate(taskId); @@ -140,15 +140,16 @@ public class UsdtAggregationWorkflowService { throw new CustomException("无权删除该归集任务"); } if (!Integer.valueOf(0).equals(task.getStatus()) - || !(Integer.valueOf(0).equals(task.getVerifyStatus()) - || Integer.valueOf(2).equals(task.getVerifyStatus()))) { - throw new CustomException("只有待审核或审核拒绝且尚未执行的任务可以删除"); + || !Integer.valueOf(2).equals(task.getVerifyStatus())) { + throw new CustomException("仅允许删除审核拒绝且尚未执行的归集任务"); } Date now = DateUtils.getNowDate(); task.setDeletedAt(now); task.setUpdatedAt(now); task.setRemark("任务已删除"); - taskMapper.updateUsdtAggregationTask(task); + if (taskMapper.updateUsdtAggregationTask(task) != 1) { + throw new CustomException("归集任务删除失败,请刷新后重试"); + } itemService.update(new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper() .eq(UsdtAggregationTaskItemPlus::getParentId, taskId) .isNull(UsdtAggregationTaskItemPlus::getDeletedAt) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtAggregationTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtAggregationTaskServiceImpl.java index 2286a94..374a02e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtAggregationTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtAggregationTaskServiceImpl.java @@ -1,5 +1,7 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.exception.CustomException; + import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; @@ -258,11 +260,8 @@ public class UsdtAggregationTaskServiceImpl extends ServiceImpl list = getByIds(Arrays.asList(ids), false, UsdtAggregationTaskPlus::getUserId, UsdtAggregationTaskPlus::getId); - checkUserPlus(list); - } - return usdtAggregationTaskMapper.deleteUsdtAggregationTaskByIds(ids); + // 禁止生成式 CRUD 绕过审核状态校验及明细级联删除,统一由工作流处理。 + throw new CustomException("请通过归集任务工作流删除审核拒绝的任务"); } /** @@ -273,10 +272,7 @@ public class UsdtAggregationTaskServiceImpl extends ServiceImpl - + + deleted_at is null and token_address = #{tokenAddress} and status = #{status} and ope_amount = #{opeAmount} and created_at = #{createdAt} and updated_at = #{updatedAt} - and deleted_at = #{deletedAt} and need_energy_num = #{needEnergyNum} and need_bandwidth_num = #{needBandwidthNum} and gap_bandwidth_num = #{gapBandwidthNum} @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -127,4 +127,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file +