diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java index 140786d..bd6e5be 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java @@ -3,6 +3,7 @@ package com.ruoyi.task.api; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.task.api.domain.TaskResultVO; import com.ruoyi.task.api.domain.TaskVO; import com.ruoyi.task.api.domain.TaskTempVO; import com.ruoyi.task.api.enums.StatusEnum; @@ -121,8 +122,10 @@ public interface RemoteTaskService * @param source 请求来源 * @return 结果 */ - @PutMapping("/task/status/{taskId}") - R updateTaskStatus(@PathVariable("taskId") Long taskId, @RequestParam("status") StatusEnum status, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/task/status/{taskId}") + R updateTaskStatus(@PathVariable("taskId") Long taskId, + @RequestBody() TaskResultVO status, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 设置 recovery 为 true diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskResultVO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskResultVO.java new file mode 100644 index 0000000..7b2226f --- /dev/null +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskResultVO.java @@ -0,0 +1,56 @@ +package com.ruoyi.task.api.domain; + +import com.ruoyi.task.api.enums.StatusEnum; + +public class TaskResultVO { + + /** 状态 */ + private StatusEnum status; + + public String getErrMsg() { + return errMsg; + } + + public void setErrMsg(String errMsg) { + this.errMsg = errMsg; + } + + public StatusEnum getStatus() { + return status; + } + + public void setStatus(StatusEnum status) { + this.status = status; + } + + /** + * 错误原因 + */ + private String errMsg; + + public static TaskResultVO Checking(){ + TaskResultVO vo = new TaskResultVO(); + vo.status = StatusEnum.CHECKING; + return vo; + } + + public static TaskResultVO Completed(){ + TaskResultVO vo = new TaskResultVO(); + vo.status = StatusEnum.COMPLETED; + return vo; + } + + public static TaskResultVO Error(String errMsg){ + TaskResultVO vo = new TaskResultVO(); + vo.status = StatusEnum.FAILED; + vo.errMsg = errMsg; + return vo; + } + + public static TaskResultVO Running(){ + TaskResultVO vo = new TaskResultVO(); + vo.status = StatusEnum.RUNNING; + + return vo; + } +} diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java index d7c8368..c58be54 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java @@ -2,6 +2,7 @@ package com.ruoyi.task.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.task.api.RemoteTaskService; +import com.ruoyi.task.api.domain.TaskResultVO; import com.ruoyi.task.api.domain.TaskVO; import com.ruoyi.task.api.domain.TaskTempVO; import com.ruoyi.task.api.enums.StatusEnum; @@ -79,7 +80,7 @@ public class RemoteTaskFallbackFactory implements FallbackFactory updateTaskStatus(Long taskId, StatusEnum status, String source) { + public R updateTaskStatus(Long taskId, TaskResultVO resultVO, String source) { return R.fail("修改执行状态失败"); }