Bug: Fix bug that job status does not get sent back when job is over
This commit is contained in:
parent
ec5eb9a075
commit
f09bb5b08f
@ -283,23 +283,19 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
|
endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
|
||||||
} else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING) {
|
} else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING && overButSending) {
|
||||||
if (overButSending) {
|
|
||||||
// 前一航线的图片没传完,就开始了新航线
|
// 前一航线的图片没传完,就开始了新航线
|
||||||
endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
|
endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
|
||||||
if (nextAirline != null) {
|
if (nextAirline != null) {
|
||||||
startAirline(nextAirline, wsVo);
|
startAirline(nextAirline, wsVo);
|
||||||
}
|
}
|
||||||
}
|
} // else {
|
||||||
|
// return;
|
||||||
wsVo.setSarStatus(curr);
|
// }
|
||||||
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
|
||||||
} else {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 4.将更新后的状态推送到前端
|
// 4.将更新后的状态推送到前端
|
||||||
// simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
wsVo.setSarStatus(curr);
|
||||||
|
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 开启新航线
|
// 开启新航线
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user