From 9a144c28a763d02e708284a41ad2cc4076b41a5f Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sat, 22 Feb 2025 00:02:44 +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=E6=B7=BB=E5=8A=A0=E9=87=8D=E8=AF=95id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{RetryTaskLogController.java => RetryTaskController.java} | 2 +- .../server/web/service/impl/RetryTaskLogServiceImpl.java | 3 ++- .../snailjob/server/web/service/impl/RetryTaskServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/{RetryTaskLogController.java => RetryTaskController.java} (98%) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/RetryTaskLogController.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/RetryTaskController.java similarity index 98% rename from snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/RetryTaskLogController.java rename to snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/RetryTaskController.java index 722364e01..c2ff74661 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/RetryTaskLogController.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/RetryTaskController.java @@ -22,7 +22,7 @@ import java.util.Set; */ @RestController @RequestMapping("/retry-task") -public class RetryTaskLogController { +public class RetryTaskController { @Autowired private RetryTaskLogService retryTaskLogService; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java index b937bd0b9..2240d395d 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java @@ -19,6 +19,7 @@ import com.aizuda.snailjob.server.web.service.convert.RetryTaskLogResponseVOConv import com.aizuda.snailjob.server.web.util.UserSessionUtils; import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper; import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper; +import com.aizuda.snailjob.template.datasource.persistence.po.Retry; import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask; import com.aizuda.snailjob.template.datasource.persistence.po.RetryTaskLogMessage; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -60,7 +61,7 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService { .between(ObjUtil.isNotNull(queryVO.getDatetimeRange()), RetryTask::getCreateDt, queryVO.getStartDt(), queryVO.getEndDt()) .select(RetryTask::getGroupName, RetryTask::getId, RetryTask::getSceneName, RetryTask::getTaskStatus, - RetryTask::getCreateDt, RetryTask::getTaskType, RetryTask::getOperationReason) + RetryTask::getCreateDt, RetryTask::getTaskType, RetryTask::getOperationReason, RetryTask::getRetryId) .orderByDesc(RetryTask::getCreateDt); PageDTO retryTaskPageDTO = retryTaskMapper.selectPage(pageDTO, wrapper); 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 b6d21a2f5..ee1841b05 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 @@ -99,7 +99,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { .eq(Retry::getTaskType, SyetemTaskTypeEnum.RETRY.getType()) .select(Retry::getId, Retry::getBizNo, Retry::getIdempotentId, Retry::getGroupName, Retry::getNextTriggerAt, Retry::getRetryCount, - Retry::getRetryStatus, Retry::getUpdateDt, Retry::getSceneName, + Retry::getRetryStatus, Retry::getUpdateDt, Retry::getCreateDt, Retry::getSceneName, Retry::getTaskType, Retry::getParentId) .orderByDesc(Retry::getCreateDt); pageDTO = accessTemplate.getRetryAccess().listPage(pageDTO, queryWrapper);