From cef5cb4fa5e6ee2325fd3738e1c8601a75277dd8 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 4 Aug 2024 18:54:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=20API=20=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=88=E7=94=B11.1.0-beta=20=3D>=201.1.0=E5=BC=95=E5=8F=91?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../top/continew/admin/job/api/JobApi.java | 7 +-- .../top/continew/admin/job/api/JobClient.java | 45 ++++++++----------- .../admin/job/enums/JobTriggerTypeEnum.java | 12 ++--- .../job/service/impl/JobServiceImpl.java | 3 +- 4 files changed, 30 insertions(+), 37 deletions(-) diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobApi.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobApi.java index b7d9e427..6498c2a1 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobApi.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobApi.java @@ -29,6 +29,7 @@ import top.continew.admin.job.model.req.JobStatusReq; import top.continew.admin.job.model.resp.JobResp; import java.util.List; +import java.util.Set; /** * 任务 REST API @@ -87,11 +88,11 @@ public interface JobApi { /** * 删除 * - * @param id ID + * @param ids ID 列表 * @return 响应信息 */ - @DeleteExchange("/job/{id}") - ResponseEntity> delete(@PathVariable("id") Long id); + @DeleteExchange("/job/ids") + ResponseEntity> delete(@RequestBody Set ids); /** * 执行 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobClient.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobClient.java index f602d176..8a451104 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobClient.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobClient.java @@ -75,18 +75,13 @@ public class JobClient { * @return 响应信息 */ public T request(Supplier>> apiSupplier) { - try { - ResponseEntity> responseEntity = apiSupplier.get(); - this.checkResponse(responseEntity); - Result result = responseEntity.getBody(); - if (!STATUS_SUCCESS.equals(result.getStatus())) { - throw new IllegalStateException(result.getMessage()); - } - return result.getData(); - } catch (Exception e) { - log.error("Request job server failed, error msg: {}", e.getMessage(), e); - throw new IllegalStateException("连接任务调度中心异常"); + ResponseEntity> responseEntity = apiSupplier.get(); + this.checkResponse(responseEntity); + Result result = responseEntity.getBody(); + if (!STATUS_SUCCESS.equals(result.getStatus())) { + throw new IllegalStateException(result.getMessage()); } + return result.getData(); } /** @@ -97,21 +92,16 @@ public class JobClient { * @return 分页列表信息 */ public PageResp requestPage(Supplier>>> apiSupplier) { - try { - ResponseEntity>> responseEntity = apiSupplier.get(); - this.checkResponse(responseEntity); - JobPageResult> result = responseEntity.getBody(); - if (!STATUS_SUCCESS.equals(result.getStatus())) { - throw new IllegalStateException(result.getMessage()); - } - PageResp page = new PageResp<>(); - page.setList(result.getData()); - page.setTotal(result.getTotal()); - return page; - } catch (Exception e) { - log.error("Request job server failed, error msg: {}", e.getMessage(), e); - throw new IllegalStateException("连接任务调度中心异常"); + ResponseEntity>> responseEntity = apiSupplier.get(); + this.checkResponse(responseEntity); + JobPageResult> result = responseEntity.getBody(); + if (!STATUS_SUCCESS.equals(result.getStatus())) { + throw new IllegalStateException(result.getMessage()); } + PageResp page = new PageResp<>(); + page.setList(result.getData()); + page.setTotal(result.getTotal()); + return page; } /** @@ -147,8 +137,9 @@ public class JobClient { } Result result = JSONUtil.toBean(response.body(), Result.class); if (!STATUS_SUCCESS.equals(result.getStatus())) { - throw new IllegalStateException("Password Authentication failed, expected a successful response. error msg: %s" - .formatted(result.getMessage())); + log.warn("Password Authentication failed, expected a successful response. error msg: {}", result + .getMessage()); + throw new IllegalStateException(result.getMessage()); } return JSONUtil.parseObj(result.getData()).getStr("token"); } diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java index e52d1b36..375ced71 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java @@ -30,15 +30,15 @@ import top.continew.starter.core.enums.BaseEnum; @RequiredArgsConstructor public enum JobTriggerTypeEnum implements BaseEnum { - /** - * CRON - */ - CRON(1, "CRON"), - /** * 固定时间 */ - FIXED_TIME(2, "固定时间"),; + FIXED_TIME(2, "固定时间"), + + /** + * CRON + */ + CRON(3, "CRON"); private final Integer value; private final String description; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java index a7674d73..ffb429bc 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java @@ -27,6 +27,7 @@ import top.continew.admin.job.model.resp.JobResp; import top.continew.admin.job.service.JobService; import top.continew.starter.extension.crud.model.resp.PageResp; +import java.util.Collections; import java.util.List; /** @@ -68,7 +69,7 @@ public class JobServiceImpl implements JobService { @Override public boolean delete(Long id) { - return Boolean.TRUE.equals(jobClient.request(() -> jobApi.delete(id))); + return Boolean.TRUE.equals(jobClient.request(() -> jobApi.delete(Collections.singleton(id)))); } @Override