From de25b70764c89ce852c5a1b4a3eb80e7cb59b4cf Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Tue, 8 Apr 2025 23:47:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.5.0-beta1):=20=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../snailjob/template/datasource/persistence/po/Retry.java | 4 ++--
 .../server/retry/task/support/dispatch/ScanRetryActor.java | 7 ++++---
 .../retry/task/support/handler/RetryTaskStopHandler.java   | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Retry.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Retry.java
index 94f0c10de..212d18096 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Retry.java
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Retry.java
@@ -23,11 +23,11 @@ public class Retry extends CreateUpdateDt {
 
     private String groupName;
 
-    private String groupId;
+    private Long groupId;
 
     private String sceneName;
 
-    private String sceneId;
+    private Long sceneId;
 
     private String idempotentId;
 
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java
index 168f83f90..4cc685e02 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java
@@ -151,7 +151,7 @@ public class ScanRetryActor extends AbstractActor {
                         .select(RetrySceneConfig::getBackOff, RetrySceneConfig::getTriggerInterval,
                                 RetrySceneConfig::getBlockStrategy, RetrySceneConfig::getSceneName,
                                 RetrySceneConfig::getCbTriggerType, RetrySceneConfig::getCbTriggerInterval,
-                                RetrySceneConfig::getExecutorTimeout)
+                                RetrySceneConfig::getExecutorTimeout, RetrySceneConfig::getId)
                         .eq(RetrySceneConfig::getSceneStatus, StatusEnum.YES.getStatus())
                         .in(RetrySceneConfig::getId, sceneIdSet));
         return StreamUtils.toIdentityMap(retrySceneConfigs, RetrySceneConfig::getId);
@@ -203,7 +203,8 @@ public class ScanRetryActor extends AbstractActor {
                 .listPage(new PageDTO<>(0, systemProperties.getRetryPullPageSize(), Boolean.FALSE),
                         new LambdaQueryWrapper<Retry>()
                                 .select(Retry::getId, Retry::getNextTriggerAt, Retry::getGroupName, Retry::getRetryCount,
-                                        Retry::getSceneName, Retry::getNamespaceId, Retry::getTaskType)
+                                        Retry::getSceneName, Retry::getNamespaceId, Retry::getTaskType,
+                                        Retry::getSceneId, Retry::getGroupId)
                                 .eq(Retry::getRetryStatus, RetryStatusEnum.RUNNING.getStatus())
                                 .in(Retry::getBucketIndex, buckets)
                                 .le(Retry::getNextTriggerAt, DateUtils.toNowMilli() + DateUtils.toEpochMilli(SystemConstants.SCHEDULE_PERIOD))
@@ -219,7 +220,7 @@ public class ScanRetryActor extends AbstractActor {
                             .eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus())
                             .in(GroupConfig::getId, StreamUtils.toSet(retries, Retry::getGroupId))),
                     GroupConfig::getId);
-            retries = retries.stream().filter(retry -> groupConfigs.contains(retry.getId())).collect(Collectors.toList());
+            retries = retries.stream().filter(retry -> groupConfigs.contains(retry.getGroupId())).collect(Collectors.toList());
         }
 
         return RetryTaskConverter.INSTANCE.toRetryPartitionTasks(retries);
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java
index 42902bd25..206b47fa8 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java
@@ -43,6 +43,7 @@ public class RetryTaskStopHandler {
         RetryExecutorResultDTO executorResultDTO = RetryTaskConverter.INSTANCE.toRetryExecutorResultDTO(stopJobDTO);
         executorResultDTO.setExceptionMsg(stopJobDTO.getMessage());
         executorResultDTO.setTaskStatus(RetryTaskStatusEnum.FAIL.getStatus());
+        executorResultDTO.setIncrementRetryCount(true);
         executorResultDTO.setOperationReason(stopJobDTO.getOperationReason());
         ActorRef actorRef = ActorGenerator.retryTaskExecutorResultActor();
         actorRef.tell(executorResultDTO, actorRef);