From 2b21366205c895a61897726fcd1aa432fdc477c8 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 18 六月 2025 09:54:51 +0800 Subject: [PATCH] 生成波次优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java index b527b50..7c95b75 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java @@ -92,14 +92,12 @@ if (Objects.isNull(ids)) { throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } - List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, ids)); - if (taskItems.isEmpty()) { + List<Long> list = Arrays.asList(ids); + List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, list)); + if (!taskItems.isEmpty()) { throw new CoolException("鏈夋湭瀹屾垚浠诲姟锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�"); } - if (!waveService.removeByIds(Arrays.asList(ids))) { - return R.error("Delete Fail"); - } - return R.ok("Delete Success").add(ids); + return waveService.cancelWave(list); } @PreAuthorize("hasAuthority('manager:wave:list')") -- Gitblit v1.9.1