Commit a351a82c by huangfusuper

折线图统计BUG修改

parent 24e2bd1c
package com.byit.thread.helper; package com.byit.thread.helper;
import com.byit.dto.StatisticsConditionDto; import com.byit.dto.StatisticsConditionDto;
import com.byit.enums.ExecuteStatusEnum;
import com.byit.enums.NodeRunStatusPropertyEnum; import com.byit.enums.NodeRunStatusPropertyEnum;
import com.byit.enums.ScheduleStatusEnum; import com.byit.enums.ScheduleStatusEnum;
import com.byit.enums.task.RunResultEnum;
import com.byit.job.utils.DateUtil; import com.byit.job.utils.DateUtil;
import com.byit.mapper.FlowStatusSnapshootMapper; import com.byit.mapper.FlowStatusSnapshootMapper;
import com.byit.mapper.WaitingRecordMapper; import com.byit.mapper.WaitingRecordMapper;
...@@ -152,7 +154,7 @@ public class JobSnapshotThreadRunHelper extends BaseThreadRunHelper { ...@@ -152,7 +154,7 @@ public class JobSnapshotThreadRunHelper extends BaseThreadRunHelper {
*/ */
public void filterKillFlow(List<RunRecording> thisDayRunRecording, List<FlowStatusSnapshoot> killFlow) { public void filterKillFlow(List<RunRecording> thisDayRunRecording, List<FlowStatusSnapshoot> killFlow) {
List<RunRecording> collect = thisDayRunRecording.stream() List<RunRecording> collect = thisDayRunRecording.stream()
.filter(runRecording -> ScheduleStatusEnum.ERROR.getCode().equals(runRecording.getFlowStatus())) .filter(runRecording -> ExecuteStatusEnum.KILL.getCode().equals(runRecording.getFlowRunResult()))
.collect(Collectors.toList()); .collect(Collectors.toList());
collect.forEach(runRecording ->{ collect.forEach(runRecording ->{
...@@ -170,7 +172,8 @@ public class JobSnapshotThreadRunHelper extends BaseThreadRunHelper { ...@@ -170,7 +172,8 @@ public class JobSnapshotThreadRunHelper extends BaseThreadRunHelper {
*/ */
public void filterErrorFlow(List<RunRecording> thisDayRunRecording, List<FlowStatusSnapshoot> errorFlow) { public void filterErrorFlow(List<RunRecording> thisDayRunRecording, List<FlowStatusSnapshoot> errorFlow) {
List<RunRecording> collect = thisDayRunRecording.stream() List<RunRecording> collect = thisDayRunRecording.stream()
.filter(runRecording -> ScheduleStatusEnum.ERROR.getCode().equals(runRecording.getFlowStatus())) .filter(runRecording -> ExecuteStatusEnum.FAIL.getCode().equals(runRecording.getFlowRunResult())
||ExecuteStatusEnum.REPAIR_FAIL.getCode().equals(runRecording.getFlowRunResult()))
.collect(Collectors.toList()); .collect(Collectors.toList());
collect.forEach(runRecording ->{ collect.forEach(runRecording ->{
...@@ -188,7 +191,8 @@ public class JobSnapshotThreadRunHelper extends BaseThreadRunHelper { ...@@ -188,7 +191,8 @@ public class JobSnapshotThreadRunHelper extends BaseThreadRunHelper {
*/ */
public void filterSuccessFlow (List<RunRecording> thisDayRunRecording, List<FlowStatusSnapshoot> successFlow) { public void filterSuccessFlow (List<RunRecording> thisDayRunRecording, List<FlowStatusSnapshoot> successFlow) {
List<RunRecording> collect = thisDayRunRecording.stream() List<RunRecording> collect = thisDayRunRecording.stream()
.filter(runRecording -> ScheduleStatusEnum.FINISH.getCode().equals(runRecording.getFlowStatus())) .filter(runRecording -> ExecuteStatusEnum.SUCCESS.equals(runRecording.getFlowRunResult()) ||
ExecuteStatusEnum.REPAIR_SUCCESS.getCode().equals(runRecording.getFlowRunResult()))
.collect(Collectors.toList()); .collect(Collectors.toList());
collect.forEach(runRecording ->{ collect.forEach(runRecording ->{
FlowStatusSnapshoot flowStatusSnapshoot = new FlowStatusSnapshoot(); FlowStatusSnapshoot flowStatusSnapshoot = new FlowStatusSnapshoot();
......
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