From 993fa4a4e1c7bf5e0e6a190894b4fc9c3c55d177 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Thu, 18 Jul 2024 09:30:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sj=5F1.1.1):=20=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E4=B8=A5=E6=A0=BC=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9D=A1=E6=95=B0=E4=B8=8E=E8=AF=B7=E6=B1=82?= =?UTF-8?q?ID=E6=95=B0=E9=87=8F=E7=9B=B8=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snailjob/server/web/controller/JobBatchController.java | 4 ++-- .../snailjob/server/web/service/handler/JobHandler.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/JobBatchController.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/JobBatchController.java index 66f70cd9..73f2f874 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/JobBatchController.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/JobBatchController.java @@ -54,7 +54,7 @@ public class JobBatchController { public Boolean deleteJobBatchByIds(@RequestBody @NotEmpty(message = "ids不能为空") @Size(max = 100, message = "最多删除 {max} 个") - Long[] ids) { - return jobBatchService.deleteJobBatchByIds(Set.of(ids)); + Set ids) { + return jobBatchService.deleteJobBatchByIds(ids); } } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java index bee28564..4f5656b2 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java @@ -176,7 +176,7 @@ public class JobHandler { @Transactional public void deleteJobTaskBatchByIds(Set ids, String namespaceId) { // 1. 删除任务批次 job_task_batch - Assert.isTrue(jobTaskBatchMapper.deleteByIds(ids) > 0, + Assert.isTrue(ids.size() == jobTaskBatchMapper.deleteByIds(ids), () -> new SnailJobServerException("删除任务批次失败")); // 2. 删除任务实例 job_task