libingkun/skyeyesystem
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev_20260130_RemoveRedis

Browse Source
This commit is contained in:
longguancheng 2026-02-03 15:52:50 +08:00
commit f34844f110
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java
View File

@ -280,23 +280,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);
} }
// 开启新航线 // 开启新航线