diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java index bca64d8..2fa1386 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java @@ -280,23 +280,19 @@ public class JmJobStatusServiceImpl implements JmJobStatusService { return; } endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null); - } else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING) { - if (overButSending) { + } else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING && overButSending) { // 前一航线的图片没传完,就开始了新航线 endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null); if (nextAirline != null) { startAirline(nextAirline, wsVo); } - } - - wsVo.setSarStatus(curr); - simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo); - } else { - return; - } + } // else { +// return; +// } // 4.将更新后的状态推送到前端 - // simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo); + wsVo.setSarStatus(curr); + simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo); } // 开启新航线