Commit 0cf8805e by huangfusuper

暂停BUG

parent 38a529b6
...@@ -1416,6 +1416,7 @@ public class ApiFlowServiceImpl implements ApiFlowService { ...@@ -1416,6 +1416,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
runParamWrapped.setPrivateParam(param); runParamWrapped.setPrivateParam(param);
param = JSON.toJSONString(runParamWrapped); param = JSON.toJSONString(runParamWrapped);
waitingTask.setRunParam(param); waitingTask.setRunParam(param);
waitingTask.setScheduleType(ScheduleTypeEnum.REPAIR.getCode());
} }
} }
waitingTaskDateList.add(waitingTask); waitingTaskDateList.add(waitingTask);
......
...@@ -76,6 +76,7 @@ public class RunNodeServiceImpl implements RunNodeServer, ApplicationEventPublis ...@@ -76,6 +76,7 @@ public class RunNodeServiceImpl implements RunNodeServer, ApplicationEventPublis
List<JobTask> jobTasks = new ArrayList<>(32); List<JobTask> jobTasks = new ArrayList<>(32);
nodes.forEach(node -> { nodes.forEach(node -> {
JobTask jobTask = new JobTask(); JobTask jobTask = new JobTask();
jobTask.setScheduleType(1);
jobTask.setTriggerStatus("1"); jobTask.setTriggerStatus("1");
BeanUtils.copyProperties(node,jobTask); BeanUtils.copyProperties(node,jobTask);
if(isScheduleFollow){ if(isScheduleFollow){
......
...@@ -252,6 +252,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask ...@@ -252,6 +252,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
ids.add(waitingTask.getId()); ids.add(waitingTask.getId());
JobTask target = new JobTask(); JobTask target = new JobTask();
target.setTriggerStatus("1"); target.setTriggerStatus("1");
target.setScheduleType(waitingTask.getScheduleType());
target.setRunId(waitingRecord.getRunId()); target.setRunId(waitingRecord.getRunId());
target.setTriggerTime(waitingTask.getTriggerTime()); target.setTriggerTime(waitingTask.getTriggerTime());
BeanUtils.copyProperties(waitingTask, target); BeanUtils.copyProperties(waitingTask, target);
......
...@@ -60,7 +60,7 @@ public class TaskAndLogServerImpl implements TaskAndLogServer { ...@@ -60,7 +60,7 @@ public class TaskAndLogServerImpl implements TaskAndLogServer {
//添加任务日志 //添加任务日志
JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs(); JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs();
int cutBackDay = 1; int cutBackDay = 1;
if (jobTask.getScheduleType() != 1) { if (jobTask.getScheduleType()!=null && jobTask.getScheduleType()!= 1) {
cutBackDay = 0; cutBackDay = 0;
} }
//执行快速失败时 将参数替换强行替换进去 替换的是私有参数 //执行快速失败时 将参数替换强行替换进去 替换的是私有参数
......
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