Commit 3321fabc by huangfusuper

冲泡任务

parent 8b2c98c5
...@@ -5,6 +5,7 @@ import com.byit.annotations.MythRankOrder; ...@@ -5,6 +5,7 @@ import com.byit.annotations.MythRankOrder;
import com.byit.dto.executor.RunParamWrapped; import com.byit.dto.executor.RunParamWrapped;
import com.byit.dto.plugin.FlowExtendedConfiguration; import com.byit.dto.plugin.FlowExtendedConfiguration;
import com.byit.enums.NodeTypeEnum; import com.byit.enums.NodeTypeEnum;
import com.byit.enums.ScheduleTypeEnum;
import com.byit.model.JobTaskSchedule; import com.byit.model.JobTaskSchedule;
import com.byit.model.RunRecording; import com.byit.model.RunRecording;
import com.byit.service.RunRecordingService; import com.byit.service.RunRecordingService;
...@@ -34,7 +35,7 @@ public class JavaParamWrappedCallback implements TaskRunTheLifeCycleCallback { ...@@ -34,7 +35,7 @@ public class JavaParamWrappedCallback implements TaskRunTheLifeCycleCallback {
*/ */
@Override @Override
public boolean matchType(JobTaskSchedule jobTaskSchedule) { public boolean matchType(JobTaskSchedule jobTaskSchedule) {
return NodeTypeEnum.JAVA.getType().equals(jobTaskSchedule.getJobType()); return NodeTypeEnum.JAVA.getType().equals(jobTaskSchedule.getJobType()) && !ScheduleTypeEnum.REPEAT.getCode().equals(jobTaskSchedule.getScheduleType());
} }
/** /**
......
...@@ -6,6 +6,7 @@ import com.byit.annotations.MythRankOrder; ...@@ -6,6 +6,7 @@ import com.byit.annotations.MythRankOrder;
import com.byit.dto.executor.RunParamWrapped; import com.byit.dto.executor.RunParamWrapped;
import com.byit.dto.executor.ScriptParamAndPlaceholderDto; import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
import com.byit.enums.NodeTypeEnum; import com.byit.enums.NodeTypeEnum;
import com.byit.enums.ScheduleTypeEnum;
import com.byit.model.JobTaskSchedule; import com.byit.model.JobTaskSchedule;
import com.byit.strategy.TaskRunTheLifeCycleCallback; import com.byit.strategy.TaskRunTheLifeCycleCallback;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -72,7 +73,7 @@ public class ScriptParamWrappedCallback implements TaskRunTheLifeCycleCallback { ...@@ -72,7 +73,7 @@ public class ScriptParamWrappedCallback implements TaskRunTheLifeCycleCallback {
if (typeByCode == null) { if (typeByCode == null) {
throw new RuntimeException(String.format("调度暂不支持此种类型的任务:%s", jobType)); throw new RuntimeException(String.format("调度暂不支持此种类型的任务:%s", jobType));
} }
//是否是脚本类型的 //是否是脚本类型的 不能是重跑的 重跑的节点是封装后的
return typeByCode.getType().equals(SCRIPT); return typeByCode.getType().equals(SCRIPT) && !ScheduleTypeEnum.REPEAT.getCode().equals(jobTaskSchedule.getScheduleType());
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment