diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/service/impl/RetryServiceImpl.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/service/impl/RetryServiceImpl.java index 6cc6485da..c33e7191c 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/service/impl/RetryServiceImpl.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/service/impl/RetryServiceImpl.java @@ -59,7 +59,8 @@ public class RetryServiceImpl implements RetryService { .in(RetryTask::getRetryStatus, RetryStatusEnum.MAX_COUNT.getStatus(), RetryStatusEnum.FINISH.getStatus()) .eq(RetryTask::getTaskType, SyetemTaskTypeEnum.CALLBACK.getType()) - .eq(RetryTask::getGroupName, groupName)).getRecords(); + .eq(RetryTask::getGroupName, groupName) + .orderByDesc(RetryTask::getId)).getRecords(); if (CollUtil.isEmpty(callbackRetryTasks)) { return Boolean.TRUE; 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 81764a204..29f27900d 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 @@ -16,7 +16,6 @@ import com.aizuda.snailjob.server.web.model.base.PageResult; import com.aizuda.snailjob.server.web.model.request.BatchDeleteRetryDeadLetterVO; import com.aizuda.snailjob.server.web.model.request.BatchRollBackRetryDeadLetterVO; import com.aizuda.snailjob.server.web.model.request.RetryDeadLetterQueryVO; -import com.aizuda.snailjob.server.web.model.request.UserSessionVO; import com.aizuda.snailjob.server.web.model.response.RetryDeadLetterResponseVO; import com.aizuda.snailjob.server.web.service.RetryDeadLetterService; import com.aizuda.snailjob.server.web.service.convert.RetryDeadLetterResponseVOConverter; @@ -37,7 +36,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author: opensnail @@ -70,7 +72,8 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService { .eq(StrUtil.isNotBlank(queryVO.getSceneName()), RetryDeadLetter::getSceneName, queryVO.getSceneName()) .eq(StrUtil.isNotBlank(queryVO.getBizNo()), RetryDeadLetter::getBizNo, queryVO.getBizNo()) .eq(StrUtil.isNotBlank(queryVO.getIdempotentId()), RetryDeadLetter::getIdempotentId, queryVO.getIdempotentId()) - .eq(StrUtil.isNotBlank(queryVO.getUniqueId()), RetryDeadLetter::getUniqueId, queryVO.getUniqueId())); + .eq(StrUtil.isNotBlank(queryVO.getUniqueId()), RetryDeadLetter::getUniqueId, queryVO.getUniqueId()) + .orderByDesc(RetryDeadLetter::getId)); return new PageResult<>(retryDeadLetterPageDTO, RetryDeadLetterResponseVOConverter.INSTANCE.convertList(retryDeadLetterPageDTO.getRecords())); @@ -140,8 +143,7 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService { new LambdaQueryWrapper() .eq(RetryDeadLetter::getGroupName, groupName) .in(RetryDeadLetter::getId, waitDelRetryDeadLetterIdSet)), - () -> new SnailJobServerException("删除死信队列数据失败")) - ; + () -> new SnailJobServerException("删除死信队列数据失败")); // 变更日志的状态 RetryTaskLog retryTaskLog = new RetryTaskLog();