From e172f40d80a6f9dca2d44ba3c6f548f380902d29 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Mon, 24 Feb 2025 22:29:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=97=A0=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../retry/task/support/dispatch/RetryExecutor.java | 14 +++++++++-----
 .../support/event/RetryTaskFailAlarmEvent.java     |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java
index 4ba2ada7b..508b5138b 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java
@@ -4,10 +4,8 @@ import akka.actor.AbstractActor;
 import akka.actor.ActorRef;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
-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.enums.StatusEnum;
+import com.aizuda.snailjob.common.core.context.SnailSpringContext;
+import com.aizuda.snailjob.common.core.enums.*;
 import com.aizuda.snailjob.common.log.SnailJobLog;
 import com.aizuda.snailjob.server.common.akka.ActorGenerator;
 import com.aizuda.snailjob.server.common.cache.CacheRegisterTable;
@@ -21,7 +19,9 @@ import com.aizuda.snailjob.server.common.util.DateUtils;
 import com.aizuda.snailjob.server.retry.task.dto.RequestCallbackExecutorDTO;
 import com.aizuda.snailjob.server.retry.task.dto.RequestRetryExecutorDTO;
 import com.aizuda.snailjob.server.retry.task.dto.RetryTaskExecuteDTO;
+import com.aizuda.snailjob.server.retry.task.dto.RetryTaskFailAlarmEventDTO;
 import com.aizuda.snailjob.server.retry.task.support.RetryTaskConverter;
+import com.aizuda.snailjob.server.retry.task.support.event.RetryTaskFailAlarmEvent;
 import com.aizuda.snailjob.server.retry.task.support.handler.RetryTaskStopHandler;
 import com.aizuda.snailjob.server.retry.task.support.timer.RetryTimeoutCheckTask;
 import com.aizuda.snailjob.server.retry.task.support.timer.RetryTimerWheel;
@@ -98,6 +98,10 @@ public class RetryExecutor extends AbstractActor {
         if (CollUtil.isEmpty(CacheRegisterTable.getServerNodeSet(retry.getGroupName(), retry.getNamespaceId()))) {
             // 无客户端不执行调度
             updateRetryTaskStatus(execute.getRetryTaskId(), RetryTaskStatusEnum.CANCEL.getStatus(), RetryOperationReasonEnum.NOT_CLIENT);
+            RetryTaskFailAlarmEventDTO toRetryTaskFailAlarmEventDTO =
+                    RetryTaskConverter.INSTANCE.toRetryTaskFailAlarmEventDTO(retry, "无客户端节点",
+                            RetryNotifySceneEnum.RETRY_NO_CLIENT_NODES_ERROR.getNotifyScene());
+            SnailSpringContext.getContext().publishEvent(new RetryTaskFailAlarmEvent(toRetryTaskFailAlarmEventDTO));
             return;
         }
 
@@ -108,7 +112,7 @@ public class RetryExecutor extends AbstractActor {
         );
         if (StatusEnum.NO.getStatus().equals(retrySceneConfig.getSceneStatus())) {
             // 场景已经关闭不执行调度
-            updateRetryTaskStatus(execute.getRetryTaskId(), RetryTaskStatusEnum.CANCEL.getStatus(), RetryOperationReasonEnum.NOT_CLIENT);
+            updateRetryTaskStatus(execute.getRetryTaskId(), RetryTaskStatusEnum.CANCEL.getStatus(), RetryOperationReasonEnum.SCENE_CLOSED);
             return;
         }
 
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/event/RetryTaskFailAlarmEvent.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/event/RetryTaskFailAlarmEvent.java
index d8cfe888a..65e42e7a4 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/event/RetryTaskFailAlarmEvent.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/event/RetryTaskFailAlarmEvent.java
@@ -14,7 +14,7 @@ import org.springframework.context.ApplicationEvent;
 @Getter
 public class RetryTaskFailAlarmEvent extends ApplicationEvent {
 
-    private RetryTaskFailAlarmEventDTO retryTaskFailAlarmEventDTO;
+    private final RetryTaskFailAlarmEventDTO retryTaskFailAlarmEventDTO;
 
     public RetryTaskFailAlarmEvent(RetryTaskFailAlarmEventDTO retryTaskFailAlarmEventDTO) {
         super(retryTaskFailAlarmEventDTO);