修改接口,添加错误信息
This commit is contained in:
parent
67d0025ccd
commit
ed9467bbd1
|
|
@ -3,6 +3,7 @@ package com.ruoyi.task.api;
|
||||||
import com.ruoyi.common.core.constant.SecurityConstants;
|
import com.ruoyi.common.core.constant.SecurityConstants;
|
||||||
import com.ruoyi.common.core.constant.ServiceNameConstants;
|
import com.ruoyi.common.core.constant.ServiceNameConstants;
|
||||||
import com.ruoyi.common.core.domain.R;
|
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.TaskVO;
|
||||||
import com.ruoyi.task.api.domain.TaskTempVO;
|
import com.ruoyi.task.api.domain.TaskTempVO;
|
||||||
import com.ruoyi.task.api.enums.StatusEnum;
|
import com.ruoyi.task.api.enums.StatusEnum;
|
||||||
|
|
@ -121,8 +122,10 @@ public interface RemoteTaskService
|
||||||
* @param source 请求来源
|
* @param source 请求来源
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@PutMapping("/task/status/{taskId}")
|
@PostMapping("/task/status/{taskId}")
|
||||||
R<Boolean> updateTaskStatus(@PathVariable("taskId") Long taskId, @RequestParam("status") StatusEnum status, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
R<Boolean> updateTaskStatus(@PathVariable("taskId") Long taskId,
|
||||||
|
@RequestBody() TaskResultVO status,
|
||||||
|
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置 recovery 为 true
|
* 设置 recovery 为 true
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -2,6 +2,7 @@ package com.ruoyi.task.api.factory;
|
||||||
|
|
||||||
import com.ruoyi.common.core.domain.R;
|
import com.ruoyi.common.core.domain.R;
|
||||||
import com.ruoyi.task.api.RemoteTaskService;
|
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.TaskVO;
|
||||||
import com.ruoyi.task.api.domain.TaskTempVO;
|
import com.ruoyi.task.api.domain.TaskTempVO;
|
||||||
import com.ruoyi.task.api.enums.StatusEnum;
|
import com.ruoyi.task.api.enums.StatusEnum;
|
||||||
|
|
@ -79,7 +80,7 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public R<Boolean> updateTaskStatus(Long taskId, StatusEnum status, String source) {
|
public R<Boolean> updateTaskStatus(Long taskId, TaskResultVO resultVO, String source) {
|
||||||
return R.fail("修改执行状态失败");
|
return R.fail("修改执行状态失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue