diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobApi.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobApi.java index c807f649..64b38cb3 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobApi.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobApi.java @@ -24,7 +24,6 @@ import top.continew.admin.schedule.config.FeignRequestInterceptor; import top.continew.admin.schedule.model.JobPageResult; import top.continew.admin.schedule.model.query.JobQuery; import top.continew.admin.schedule.model.req.JobReq; -import top.continew.admin.schedule.model.req.JobStatusReq; import top.continew.admin.schedule.model.req.JobTriggerReq; import top.continew.admin.schedule.model.resp.JobResp; @@ -68,15 +67,6 @@ public interface JobApi { @PutMapping Result update(@RequestBody JobReq req); - /** - * 修改状态 - * - * @param req 请求参数 - * @return 响应信息 - */ - @PutMapping("/status") - Result updateStatus(@RequestBody JobStatusReq req); - /** * 删除 * diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobStatusReq.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobStatusReq.java index 355b209a..450c36a8 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobStatusReq.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobStatusReq.java @@ -44,10 +44,4 @@ public class JobStatusReq implements Serializable { @Schema(description = "任务状态", example = "1") @NotNull(message = "任务状态无效") private JobStatusEnum jobStatus; - - /** - * ID - */ - @Schema(hidden = true) - private Long id; } diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobServiceImpl.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobServiceImpl.java index 0b35d14d..5dbfb5b6 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobServiceImpl.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobServiceImpl.java @@ -16,11 +16,14 @@ package top.continew.admin.schedule.service.impl; +import com.aizuda.snailjob.client.job.core.openapi.SnailJobOpenApi; +import com.aizuda.snailjob.common.core.enums.StatusEnum; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import top.continew.admin.schedule.api.JobApi; import top.continew.admin.schedule.api.JobClient; import top.continew.admin.schedule.api.JobGroupApi; +import top.continew.admin.schedule.enums.JobStatusEnum; import top.continew.admin.schedule.model.query.JobQuery; import top.continew.admin.schedule.model.req.JobReq; import top.continew.admin.schedule.model.req.JobStatusReq; @@ -65,8 +68,9 @@ public class JobServiceImpl implements JobService { @Override public boolean updateStatus(JobStatusReq req, Long id) { - req.setId(id); - return Boolean.TRUE.equals(jobClient.request(() -> jobApi.updateStatus(req))); + return SnailJobOpenApi.updateJobStatus(id) + .setStatus(JobStatusEnum.DISABLED.equals(req.getJobStatus()) ? StatusEnum.NO : StatusEnum.YES) + .execute(); } @Override