From 7f350e9a962439b0080602600dbdc03db1d70e24 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sun, 23 Feb 2025 22:37:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=201.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=80=89=E6=8B=A9=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/model/request/RetryTaskQueryVO.java | 2 +- .../impl/RetryDeadLetterServiceImpl.java | 17 +++-------------- .../web/service/impl/RetryTaskServiceImpl.java | 3 +-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java index c80461566..cf1bf5d3e 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java @@ -24,7 +24,7 @@ public class RetryTaskQueryVO extends BaseQueryVO { private Long retryId; - private Integer retryStatus; + private Integer taskStatus; private LocalDateTime beginDate; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java index 8d75d8ef1..b1af0a2be 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java @@ -11,7 +11,6 @@ import com.aizuda.snailjob.server.common.enums.SyetemTaskTypeEnum; import com.aizuda.snailjob.server.common.exception.SnailJobServerException; import com.aizuda.snailjob.server.common.strategy.WaitStrategies.WaitStrategyContext; import com.aizuda.snailjob.server.common.strategy.WaitStrategies.WaitStrategyEnum; -import com.aizuda.snailjob.server.common.util.DateUtils; import com.aizuda.snailjob.server.retry.task.support.RetryTaskConverter; import com.aizuda.snailjob.server.web.model.base.PageResult; import com.aizuda.snailjob.server.web.model.request.BatchDeleteRetryDeadLetterVO; @@ -24,13 +23,10 @@ import com.aizuda.snailjob.server.web.util.UserSessionUtils; import com.aizuda.snailjob.template.datasource.access.AccessTemplate; import com.aizuda.snailjob.template.datasource.access.ConfigAccess; import com.aizuda.snailjob.template.datasource.access.TaskAccess; -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.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,21 +36,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.aizuda.snailjob.common.core.enums.RetryStatusEnum.ALLOW_DELETE_STATUS; - /** * @author: opensnail * @date : 2022-02-28 09:46 */ @Service +@RequiredArgsConstructor public class RetryDeadLetterServiceImpl implements RetryDeadLetterService { - - @Autowired - private AccessTemplate accessTemplate; - @Autowired - private RetryTaskMapper retryTaskMapper; - @Autowired - private RetryTaskLogMessageMapper retryTaskLogMessageMapper; + private final AccessTemplate accessTemplate; @Override public PageResult> getRetryDeadLetterPage(RetryDeadLetterQueryVO queryVO) { 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 f2ade4acb..7f13123ad 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 @@ -5,7 +5,6 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.RetryOperationReasonEnum; -import com.aizuda.snailjob.common.core.enums.RetryStatusEnum; import com.aizuda.snailjob.common.core.enums.RetryTaskStatusEnum; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.log.constant.LogFieldConstants; @@ -64,7 +63,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { .eq(RetryTask::getNamespaceId, namespaceId) .in(CollUtil.isNotEmpty(groupNames), RetryTask::getGroupName, groupNames) .eq(StrUtil.isNotBlank(queryVO.getSceneName()), RetryTask::getSceneName, queryVO.getSceneName()) - .eq(queryVO.getRetryStatus() != null, RetryTask::getTaskStatus, queryVO.getRetryStatus()) + .eq(queryVO.getTaskStatus() != null, RetryTask::getTaskStatus, queryVO.getTaskStatus()) .eq(Objects.nonNull(queryVO.getRetryId()), RetryTask::getRetryId, queryVO.getRetryId()) .between(ObjUtil.isNotNull(queryVO.getDatetimeRange()), RetryTask::getCreateDt, queryVO.getStartDt(), queryVO.getEndDt())