From 04b6054c97b83e7eeb89259865d725047e058f5c Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Tue, 25 Feb 2025 23:32:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=201.=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E6=94=AF=E6=8C=81=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E9=87=8D=E8=AF=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../support/generator/retry/AbstractGenerator.java   |  2 ++
 .../web/model/response/RetryTaskResponseVO.java      |  2 ++
 .../web/service/impl/RetryTaskServiceImpl.java       | 12 +++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

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 e63724fad..8dfeb865c 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 779438acc..830aa01e4 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 7f13123ad..78246f74e 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