From fa635db300debb579a68f8cca592eccb2c24f193 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Thu, 4 Jul 2024 13:33:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.1.0-beta2):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/job/task/support/dispatch/JobExecutorActor.java | 2 +- .../job/task/support/executor/job/AbstractJobExecutor.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java index b5d55fd6..cac5f2c2 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java @@ -152,7 +152,7 @@ public class JobExecutorActor extends AbstractActor { // 事务提交以后再执行任务 TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { @Override - public void afterCompletion(final int status) { + public void afterCommit() { // 获取工作流的上下文 WorkflowTaskBatch workflowTaskBatch = null; Long workflowTaskBatchId = taskExecute.getWorkflowTaskBatchId(); diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/AbstractJobExecutor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/AbstractJobExecutor.java index ded9f82c..8d3bac0e 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/AbstractJobExecutor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/AbstractJobExecutor.java @@ -1,5 +1,7 @@ package com.aizuda.snailjob.server.job.task.support.executor.job; +import cn.hutool.core.collection.CollUtil; +import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.job.task.support.JobExecutor; import org.springframework.beans.factory.InitializingBean; import org.springframework.transaction.annotation.Transactional; @@ -12,8 +14,11 @@ import org.springframework.transaction.annotation.Transactional; public abstract class AbstractJobExecutor implements JobExecutor, InitializingBean { @Override - @Transactional public void execute(JobExecutorContext context) { + if (CollUtil.isEmpty(context.getTaskList())) { + SnailJobLog.LOCAL.warn("待执行的任务列表为空. taskBatchId:[{}]", context.getTaskBatchId()); + return; + } doExecute(context); }