diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java index e63724fa..8dfeb865 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java @@ -125,6 +125,8 @@ public abstract class AbstractGenerator implements TaskGenerator { retry.setGroupName(taskContext.getGroupName()); retry.setSceneName(taskContext.getSceneName()); retry.setRetryStatus(initStatus(taskContext)); + retry.setParentId(0L); + retry.setDeleted(0L); if (StrUtil.isBlank(retry.getBizNo())) { // 默认生成一个业务单据号方便用户查询 retry.setBizNo(IdUtil.fastSimpleUUID()); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryTaskResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryTaskResponseVO.java index 779438ac..830aa01e 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryTaskResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryTaskResponseVO.java @@ -32,4 +32,6 @@ public class RetryTaskResponseVO { */ private String clientInfo; + private RetryResponseVO responseVO; + } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java index 7f13123a..78246f74 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java @@ -15,11 +15,13 @@ import com.aizuda.snailjob.server.web.model.base.PageResult; import com.aizuda.snailjob.server.web.model.request.RetryTaskLogMessageQueryVO; import com.aizuda.snailjob.server.web.model.request.RetryTaskQueryVO; import com.aizuda.snailjob.server.web.model.request.UserSessionVO; +import com.aizuda.snailjob.server.web.model.response.RetryResponseVO; import com.aizuda.snailjob.server.web.model.response.RetryTaskLogMessageResponseVO; import com.aizuda.snailjob.server.web.model.response.RetryTaskResponseVO; import com.aizuda.snailjob.server.web.service.RetryTaskService; import com.aizuda.snailjob.server.web.service.convert.RetryConverter; import com.aizuda.snailjob.server.web.service.convert.RetryTaskLogResponseVOConverter; +import com.aizuda.snailjob.server.web.service.convert.RetryTaskResponseVOConverter; import com.aizuda.snailjob.server.web.util.UserSessionUtils; import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper; import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper; @@ -165,7 +167,15 @@ public class RetryTaskServiceImpl implements RetryTaskService { @Override public RetryTaskResponseVO getRetryTaskById(Long id) { RetryTask retryTask = retryTaskMapper.selectById(id); - return RetryTaskLogResponseVOConverter.INSTANCE.convert(retryTask); + + if (retryTask == null) { + return null; + } + + Retry retry = retryMapper.selectById(retryTask.getRetryId()); + RetryTaskResponseVO responseVO = RetryTaskLogResponseVOConverter.INSTANCE.convert(retryTask); + responseVO.setResponseVO(RetryTaskResponseVOConverter.INSTANCE.convert(retry)); + return responseVO; } @Override