Compare commits
No commits in common. "f34844f110b0095bf90dd0066965c716a1d731cd" and "77e6de4c8b5d36e970ed3b9f7e9ddcb7ad947176" have entirely different histories.
f34844f110
...
77e6de4c8b
@ -280,19 +280,23 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
|
||||
return;
|
||||
}
|
||||
endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
|
||||
} else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING && overButSending) {
|
||||
} else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING) {
|
||||
if (overButSending) {
|
||||
// 前一航线的图片没传完,就开始了新航线
|
||||
endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
|
||||
if (nextAirline != null) {
|
||||
startAirline(nextAirline, wsVo);
|
||||
}
|
||||
} // else {
|
||||
// return;
|
||||
// }
|
||||
}
|
||||
|
||||
wsVo.setSarStatus(curr);
|
||||
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
// 4.将更新后的状态推送到前端
|
||||
wsVo.setSarStatus(curr);
|
||||
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
||||
// simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
||||
}
|
||||
|
||||
// 开启新航线
|
||||
|
||||
Loading…
Reference in New Issue
Block a user