Commit 373de7c1 by huangfusuper

处理停止后的僵尸节点以及不告警BUG

parent 985fd6a8
......@@ -48,6 +48,8 @@ public interface JobTaskService {
*/
void removeMythJobTaskById(Integer id);
void update(JobTask jobTask);
/**
* 根据集合删除
* @param jobTasks
......
......@@ -7,6 +7,7 @@ import com.byit.dto.FlowConditionDto;
import com.byit.dto.StatisticsConditionDto;
import com.byit.dto.web.ResponseResult;
import com.byit.enums.FlowPropertyEnum;
import com.byit.enums.JobTriggerStatusEnums;
import com.byit.enums.NodePropertyEnum;
import com.byit.job.utils.CronExpression;
import com.byit.mapper.*;
......@@ -16,6 +17,7 @@ import com.byit.model.vo.FlowViewVo;
import com.byit.model.vo.FlowVo;
import com.byit.model.vo.NodeVo;
import com.byit.service.FlowService;
import com.byit.service.JobTaskService;
import com.byit.util.FlowInitUtil;
import com.byit.utils.ValidationUtil;
import lombok.extern.slf4j.Slf4j;
......@@ -52,6 +54,8 @@ public class FlowServiceImpl implements FlowService {
private RunRecordingMapper runRecordingMapper;
@Resource
private WorkspaceMapper workspaceMapper;
@Resource
private JobTaskService jobTaskService;
/**
......@@ -458,6 +462,16 @@ public class FlowServiceImpl implements FlowService {
}
}
}
//释放该工作流下所由暂停的节点
runRecordingList.forEach(runRecording -> {
String runIdS = runRecording.getRunId();
List<JobTask> byRunId = jobTaskService.findByRunId(runIdS);
List<JobTask> stopTask = byRunId.stream().filter(task -> JobTriggerStatusEnums.STOP.getCode().equals(task.getTriggerStatus())).collect(Collectors.toList());
stopTask.forEach(task ->{
task.setTriggerStatus(JobTriggerStatusEnums.START.getCode());
jobTaskService.update(task);
});
});
return result;
}
......
......@@ -71,6 +71,11 @@ public class JobTaskServiceImpl implements JobTaskService {
jobTaskMapper.deleteById(id);
}
@Override
public void update(JobTask jobTask) {
jobTaskMapper.updateJobTask(jobTask);
}
/**
* 删除多个任务 根据id
* @param jobTaskSchedules 任务实体
......
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