From 5ba5467e4c6ac6f1ca6cf3a3cd52e7c27fdf0022 Mon Sep 17 00:00:00 2001 From: zhengweilin Date: Sat, 11 Jan 2025 21:38:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.3.0-beta1.1):=201=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=87=8D=E8=AF=95=E5=9C=BA=E6=99=AF=E9=87=8D=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=B6=85=E8=BF=87=E9=98=88=E5=80=BC=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=91=8A=E8=AD=A6=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/schedule/AbstractRetryTaskAlarmSchedule.java | 6 ++++-- .../schedule/RetryErrorMoreThresholdAlarmSchedule.java | 6 ++++++ .../schedule/RetryTaskMoreThresholdAlarmSchedule.java | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/AbstractRetryTaskAlarmSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/AbstractRetryTaskAlarmSchedule.java index 9bd3f45a..e4258c1f 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/AbstractRetryTaskAlarmSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/AbstractRetryTaskAlarmSchedule.java @@ -3,7 +3,6 @@ package com.aizuda.snailjob.server.retry.task.support.schedule; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; -import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.core.util.StreamUtils; import com.aizuda.snailjob.server.common.Lifecycle; import com.aizuda.snailjob.server.common.dto.PartitionTask; @@ -21,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import java.util.*; @@ -30,6 +30,7 @@ import java.util.*; * @date 2025-01-11 * @since 1.3.0-beta1.1 */ +@Slf4j public abstract class AbstractRetryTaskAlarmSchedule extends AbstractSchedule implements Lifecycle { @Autowired protected AccessTemplate accessTemplate; @@ -61,6 +62,7 @@ public abstract class AbstractRetryTaskAlarmSchedule extends AbstractSchedule im protected abstract void doSendAlarm(RetrySceneConfigPartitionTask partitionTask, Map notifyConfigInfo); + protected abstract RetryNotifySceneEnum getNotifyScene(); /** * 获取需要处理的配置信息 @@ -107,7 +109,7 @@ public abstract class AbstractRetryTaskAlarmSchedule extends AbstractSchedule im .list(new LambdaQueryWrapper() .in(NotifyConfig::getId, retryNotifyIds) .eq(NotifyConfig::getNotifyStatus, StatusEnum.YES.getStatus()) - .eq(NotifyConfig::getNotifyScene, RetryNotifySceneEnum.MAX_RETRY_ERROR.getNotifyScene()) + .eq(NotifyConfig::getNotifyScene, getNotifyScene().getNotifyScene()) .orderByAsc(NotifyConfig::getId))); if (CollUtil.isEmpty(notifyConfigs)) { return Maps.newHashMap(); diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryErrorMoreThresholdAlarmSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryErrorMoreThresholdAlarmSchedule.java index 77073b63..3a24325a 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryErrorMoreThresholdAlarmSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryErrorMoreThresholdAlarmSchedule.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.core.alarm.Alarm; import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.alarm.SnailJobAlarmFactory; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.core.util.EnvironmentUtils; import com.aizuda.snailjob.server.common.Lifecycle; import com.aizuda.snailjob.server.common.util.DateUtils; @@ -98,6 +99,11 @@ public class RetryErrorMoreThresholdAlarmSchedule extends AbstractRetryTaskAlarm } } + @Override + protected RetryNotifySceneEnum getNotifyScene() { + return RetryNotifySceneEnum.MAX_RETRY_ERROR; + } + @Override public String lockName() { diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java index f5ab7859..14f55dc0 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.retry.task.support.schedule; import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.alarm.SnailJobAlarmFactory; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.core.enums.RetryStatusEnum; import com.aizuda.snailjob.common.core.util.EnvironmentUtils; import com.aizuda.snailjob.server.common.Lifecycle; @@ -92,6 +93,11 @@ public class RetryTaskMoreThresholdAlarmSchedule extends AbstractRetryTaskAlarmS } + @Override + protected RetryNotifySceneEnum getNotifyScene() { + return RetryNotifySceneEnum.MAX_RETRY; + } + @Override public String lockName() { return "retryTaskMoreThreshold";