Commit 09cc6780 by huangfusuper

正常调度增加系统调度

parent 67959beb
...@@ -39,6 +39,8 @@ import java.util.*; ...@@ -39,6 +39,8 @@ import java.util.*;
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@Slf4j @Slf4j
public class RunNodeServiceImpl implements RunNodeServer, ApplicationEventPublisherAware { public class RunNodeServiceImpl implements RunNodeServer, ApplicationEventPublisherAware {
private static final String TRIGGER_NAME = "系统调度";
private final RunRecordingService runRecordingService; private final RunRecordingService runRecordingService;
private final JobTaskService jobTaskService; private final JobTaskService jobTaskService;
private final FlowService flowService; private final FlowService flowService;
...@@ -78,7 +80,7 @@ public class RunNodeServiceImpl implements RunNodeServer, ApplicationEventPublis ...@@ -78,7 +80,7 @@ public class RunNodeServiceImpl implements RunNodeServer, ApplicationEventPublis
build.setDispatchIp("0.0.0.0"); build.setDispatchIp("0.0.0.0");
build.setFlowVersionName(flow.getVersionName()); build.setFlowVersionName(flow.getVersionName());
build.setTriggerTime(flow.getTriggerNextTime()); build.setTriggerTime(flow.getTriggerNextTime());
build.setOperator(TRIGGER_NAME);
boolean isScheduleFollow = "1".equals(flow.getScheduleFollow()); boolean isScheduleFollow = "1".equals(flow.getScheduleFollow());
log.info("-------------【开始保存节点信息,任务是否为跟随工作流,{}】---------------", isScheduleFollow); log.info("-------------【开始保存节点信息,任务是否为跟随工作流,{}】---------------", isScheduleFollow);
......
...@@ -125,7 +125,7 @@ public class ScriptFlowParamMergeTaskRunTheLifeCycleCallback implements TaskRunT ...@@ -125,7 +125,7 @@ public class ScriptFlowParamMergeTaskRunTheLifeCycleCallback implements TaskRunT
throw new RuntimeException(String.format("调度暂不支持此种类型的任务:%s", jobType)); throw new RuntimeException(String.format("调度暂不支持此种类型的任务:%s", jobType));
} }
boolean equals = typeByCode.getType().equals(SCRIPT); boolean equals = typeByCode.getType().equals(SCRIPT);
boolean isPlugin = jobTaskSchedule.getScheduleType() != null && 4 != jobTaskSchedule.getScheduleType(); boolean isPlugin = 4 != jobTaskSchedule.getScheduleType();
return equals && isPlugin; return equals && isPlugin;
} }
} }
...@@ -25,6 +25,8 @@ public class FlowThreadRunHelper extends BaseThreadRunHelper { ...@@ -25,6 +25,8 @@ public class FlowThreadRunHelper extends BaseThreadRunHelper {
private static final String LOCK_NAME = "flow_lock"; private static final String LOCK_NAME = "flow_lock";
private final DataSource dataSource; private final DataSource dataSource;
private final FlowService flowService; private final FlowService flowService;
private final NodeService nodeService; private final NodeService nodeService;
private final RunNodeServer runNodeServer; private final RunNodeServer runNodeServer;
......
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