From 6ca192e69e1b31973f0694c41e6e6343cf8dddb8 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Wed, 4 Sep 2024 15:12:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:(1.2.0-beta1):=20=E4=BF=AE=E5=A4=8Doracle?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E5=81=B6?=
 =?UTF-8?q?=E5=8F=91=E5=A4=B1=E8=B4=A5=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../batch/JobTaskBatchGenerator.java          | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java
index 0bbaa78ee..f0d06bb42 100644
--- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java
+++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java
@@ -26,6 +26,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -99,7 +101,16 @@ public class JobTaskBatchGenerator {
         jobTimerTaskDTO.setTaskExecutorScene(context.getTaskExecutorScene());
         jobTimerTaskDTO.setWorkflowTaskBatchId(context.getWorkflowTaskBatchId());
         jobTimerTaskDTO.setWorkflowNodeId(context.getWorkflowNodeId());
-        JobTimerWheel.registerWithJob(() -> new JobTimerTask(jobTimerTaskDTO), Duration.ofMillis(delay));
+        if (TransactionSynchronizationManager.isActualTransactionActive()) {
+            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+                @Override
+                public void afterCompletion(int status) {
+                    JobTimerWheel.registerWithJob(() -> new JobTimerTask(jobTimerTaskDTO), Duration.ofMillis(delay));
+                }
+            });
+        } else {
+            JobTimerWheel.registerWithJob(() -> new JobTimerTask(jobTimerTaskDTO), Duration.ofMillis(delay));
+        }
         return jobTaskBatch;
     }
 
@@ -119,7 +130,17 @@ public class JobTaskBatchGenerator {
         taskExecuteDTO.setWorkflowTaskBatchId(context.getWorkflowTaskBatchId());
         taskExecuteDTO.setWorkflowNodeId(context.getWorkflowNodeId());
         Job job = jobMapper.selectById(context.getJobId());
-        jobTaskBatchHandler.openResidentTask(job, taskExecuteDTO);
+        if (TransactionSynchronizationManager.isActualTransactionActive()) {
+            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+                @Override
+                public void afterCompletion(int status) {
+                    jobTaskBatchHandler.openResidentTask(job, taskExecuteDTO);
+                }
+            });
+        } else {
+            jobTaskBatchHandler.openResidentTask(job, taskExecuteDTO);
+        }
+
     }
 
     private void openNextWorkflow(JobTaskBatchGeneratorContext context, JobTaskBatch jobTaskBatch) {