Commit f9da5bb2 by huangfusuper

【BUg修改】自动扫描即将执行的工作流BUG修改完毕

parent fd3e90d9
...@@ -146,17 +146,22 @@ public class JobScheduleHelper{ ...@@ -146,17 +146,22 @@ public class JobScheduleHelper{
BeanUtils.copyProperties(jobTask,jobTaskSchedule); BeanUtils.copyProperties(jobTask,jobTaskSchedule);
jobTaskSchedules.add(jobTaskSchedule); jobTaskSchedules.add(jobTaskSchedule);
}else { }else {
//查询该节点的依赖节点
List<Integer> dependIdByNodeId = nodeDependencyService.findDependIdByNodeId(jobTask.getNodeId()); List<Integer> dependIdByNodeId = nodeDependencyService.findDependIdByNodeId(jobTask.getNodeId());
//这里返回的是上级节点的日志执行情况
List<JobTaskRunLog> jobTaskRunLogList = jobTaskRunLogService.findJobTaskRunLogNotEndNodeByRunCodeCount(dependIdByNodeId, jobTask.getRunId()); List<JobTaskRunLog> jobTaskRunLogList = jobTaskRunLogService.findJobTaskRunLogNotEndNodeByRunCodeCount(dependIdByNodeId, jobTask.getRunId());
//如果上级节点为空的情况,就证明他的伤及节点一个都没执行成功,直接到下一个节点
if (CollectionUtil.isEmpty(jobTaskRunLogList)){ if (CollectionUtil.isEmpty(jobTaskRunLogList)){
return; return;
} }
//如果不为空 证明是有父类节点的,那么就要判断
for (JobTaskRunLog jobTaskRunLog :jobTaskRunLogList){ for (JobTaskRunLog jobTaskRunLog :jobTaskRunLogList){
//如果该节点不是成功的或者补批成功的 那么就跳过
if(!("1".equals(jobTaskRunLog.getRunCode()) || "3".equals(jobTaskRunLog.getRunCode()))){ if(!("1".equals(jobTaskRunLog.getRunCode()) || "3".equals(jobTaskRunLog.getRunCode()))){
return; return;
} }
} }
//到这里 父类节点一定是全部都执行成功了!
JobTaskSchedule jobTaskSchedule = new JobTaskSchedule(); JobTaskSchedule jobTaskSchedule = new JobTaskSchedule();
BeanUtils.copyProperties(jobTask,jobTaskSchedule); BeanUtils.copyProperties(jobTask,jobTaskSchedule);
jobTaskSchedules.add(jobTaskSchedule); jobTaskSchedules.add(jobTaskSchedule);
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
run_msg, trigger_msg run_msg, trigger_msg
</sql> </sql>
<!--这个差的是啥? 根据runId 和 上级节点的集合 查询所有的上级节点-->
<select id="findJobTaskRunLogNotEndNodeByRunCodeCount" resultMap="BaseResultMap"> <select id="findJobTaskRunLogNotEndNodeByRunCodeCount" resultMap="BaseResultMap">
select <include refid="Base_Column_List" /> select <include refid="Base_Column_List" />
from job_task_run_log from job_task_run_log
......
...@@ -16,7 +16,7 @@ import java.io.IOException; ...@@ -16,7 +16,7 @@ import java.io.IOException;
public class Mains { public class Mains {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
new JobRunServerLauncher(8888); new JobRunServerLauncher(8888);
String plServerUrl = "http://10.0.55.238:8888"; /*String plServerUrl = "http://10.0.55.238:8888";
String mythCron = "时间"; String mythCron = "时间";
String routingStrategy = LoadBalance.ROUND.name(); String routingStrategy = LoadBalance.ROUND.name();
String blockingStrategy = "阻塞策略"; String blockingStrategy = "阻塞策略";
...@@ -34,7 +34,7 @@ public class Mains { ...@@ -34,7 +34,7 @@ public class Mains {
javaBeanJobInfo1.setJobHandelName("END"); javaBeanJobInfo1.setJobHandelName("END");
javaBeanJobInfo1.setParam("延迟任务"); javaBeanJobInfo1.setParam("延迟任务");
JobUtils.addJob(javaBeanJobInfo1); JobUtils.addJob(javaBeanJobInfo1);
JobUtils.addJob(pluginBeanJobInfo); JobUtils.addJob(pluginBeanJobInfo);*/
} }
} }
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