From a04c5f7c8e9111ca62465190097849c30a5627bf Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Fri, 6 Sep 2024 10:11:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:(1.2.0-beta1):=201.=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=89=8B=E5=8A=A8=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=E6=97=B6=E5=8F=AA=E5=85=81=E8=AE=B8=E6=9C=AA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=89=8D=E8=83=BD=E5=81=9C=E6=AD=A2=202.=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=E5=81=9C=E6=AD=A2=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/job/task/dto/CompleteJobBatchDTO.java | 4 +++- .../server/job/task/dto/RealStopTaskInstanceDTO.java | 5 ----- .../support/result/job/JobExecutorResultContext.java | 9 +++++---- .../server/job/task/support/stop/RealStopTaskActor.java | 3 ++- .../web/service/impl/WorkflowBatchServiceImpl.java | 2 ++ 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/CompleteJobBatchDTO.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/CompleteJobBatchDTO.java index b85002dc..92e0eefe 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/CompleteJobBatchDTO.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/CompleteJobBatchDTO.java @@ -1,6 +1,7 @@ package com.aizuda.snailjob.server.job.task.dto; import lombok.Data; +import lombok.EqualsAndHashCode; /** @@ -8,8 +9,9 @@ import lombok.Data; * @date 2023-12-24 23:00:24 * @since 2.6.0 */ +@EqualsAndHashCode(callSuper = true) @Data -public class CompleteJobBatchDTO { +public class CompleteJobBatchDTO extends BaseDTO { private Long jobId; private Long workflowNodeId; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/RealStopTaskInstanceDTO.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/RealStopTaskInstanceDTO.java index d3111f16..2948d9f6 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/RealStopTaskInstanceDTO.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/RealStopTaskInstanceDTO.java @@ -12,9 +12,4 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) @Data public class RealStopTaskInstanceDTO extends BaseDTO { - - /** - * 下次触发时间 - */ - private LocalDateTime nextTriggerAt; } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/JobExecutorResultContext.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/JobExecutorResultContext.java index 020cb2c8..63ec0256 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/JobExecutorResultContext.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/JobExecutorResultContext.java @@ -1,7 +1,9 @@ package com.aizuda.snailjob.server.job.task.support.result.job; +import com.aizuda.snailjob.server.job.task.dto.BaseDTO; import com.aizuda.snailjob.template.datasource.persistence.po.JobTask; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @@ -10,15 +12,13 @@ import java.util.List; * @date : 2024-09-04 * @since :1.2.0 */ +@EqualsAndHashCode(callSuper = true) @Data -public class JobExecutorResultContext { +public class JobExecutorResultContext extends BaseDTO { - private Long jobId; private Long workflowNodeId; private Long workflowTaskBatchId; - private Long taskBatchId; private Integer jobOperationReason; - private Integer taskType; private boolean isRetry; private List jobTaskList; @@ -32,4 +32,5 @@ public class JobExecutorResultContext { */ private boolean taskBatchComplete; + } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java index 1671f014..22f60950 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java @@ -3,6 +3,7 @@ package com.aizuda.snailjob.server.job.task.support.stop; import akka.actor.AbstractActor; import com.aizuda.snailjob.client.model.StopJobDTO; import com.aizuda.snailjob.common.core.model.Result; +import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.common.cache.CacheRegisterTable; import com.aizuda.snailjob.server.common.dto.RegisterNodeInfo; @@ -32,7 +33,7 @@ public class RealStopTaskActor extends AbstractActor { try { doStop(realStopTaskInstanceDTO); } catch (Exception e) { - log.error("停止任务执行失败", e); + log.error("停止任务执行失败. [{}]", JsonUtil.toJsonString(realStopTaskInstanceDTO), e); } }).build(); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java index dd9eb215..17ff0a76 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java @@ -223,6 +223,8 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { public Boolean stop(Long id) { WorkflowTaskBatch workflowTaskBatch = workflowTaskBatchMapper.selectById(id); Assert.notNull(workflowTaskBatch, () -> new SnailJobServerException("workflow batch can not be null.")); + Assert.isTrue(JobTaskBatchStatusEnum.NOT_COMPLETE.contains(workflowTaskBatch.getTaskBatchStatus()), + () -> new SnailJobServerException("workflow batch status completed.")); workflowBatchHandler.stop(id, JobOperationReasonEnum.MANNER_STOP.getReason()); return Boolean.TRUE;