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

Bug: Fix bug that back wave and job status did not send back to frontend

Browse Source
This commit is contained in:
Bingkun Li 2026-01-31 14:52:18 +08:00
parent d262796fbd
commit 5c28a9c14e
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,17 +283,23 @@ 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 && overButSending) { } else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING) {
// 前一航线的图片没传完，就开始了新航线 if (overButSending) {
endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null); // 前一航线的图片没传完，就开始了新航线
if (nextAirline != null) { endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
startAirline(nextAirline, wsVo); if (nextAirline != null) {
startAirline(nextAirline, wsVo);
}
} }
// simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, curr);
} else { } else {
return; return;
} }
// 4.将更新后的状态推送到前端 // 4.将更新后的状态推送到前端
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo); // simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
} }
// 开启新航线 // 开启新航线

12
backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/consts/CacheKey.java
View File

@ -83,30 +83,30 @@ public class CacheKey {
/** /**
* 运动规划响应，1秒 * 运动规划响应，1秒
*/ */
public static final String SMP_WAYPOINT_RES = "skyeye:smp:waypoint:"; //public static final String SMP_WAYPOINT_RES = "skyeye:smp:waypoint:";
/** /**
* 飞行控制响应，1秒 * 飞行控制响应，1秒
*/ */
public static final String SMP_FLIGHT_RES = "skyeye:smp:flight:"; //public static final String SMP_FLIGHT_RES = "skyeye:smp:flight:";
/** /**
* 云台控制响应，1秒 * 云台控制响应，1秒
*/ */
public static final String SMP_GIMBALMGR_RES = "skyeye:smp:gimbalmgr:"; //public static final String SMP_GIMBALMGR_RES = "skyeye:smp:gimbalmgr:";
/** /**
* 数据订阅响应，1秒 * 数据订阅响应，1秒
*/ */
public static final String SMP_SUBSCRIPT_RES = "skyeye:smp:subscript:"; //public static final String SMP_SUBSCRIPT_RES = "skyeye:smp:subscript:";
/** /**
* 数据订阅回传数据，1秒 * 数据订阅回传数据，1秒
*/ */
public static final String SMP_SUBSCRIPT_DATA = "skyeye:smp:subscript:"; //public static final String SMP_SUBSCRIPT_DATA = "skyeye:smp:subscript:";
/** /**
* 相机视频流响应，1秒 * 相机视频流响应，1秒
*/ */
public static final String SMP_VIDEO_RES = "skyeye:smp:video:"; //public static final String SMP_VIDEO_RES = "skyeye:smp:video:";
} }

7
backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarBackWsServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.zhangy.skyeye.sar.service.impl;
import com.zhangy.skyeye.jm.dto.JmAirlineStatusDTO; import com.zhangy.skyeye.jm.dto.JmAirlineStatusDTO;
import com.zhangy.skyeye.jm.dto.JmUavStatusDTO; import com.zhangy.skyeye.jm.dto.JmUavStatusDTO;
import com.zhangy.skyeye.jm.entity.JmImage; import com.zhangy.skyeye.jm.entity.JmImage;
import com.zhangy.skyeye.jm.service.JmJobStatusService;
import com.zhangy.skyeye.publics.consts.WebSocketKey; import com.zhangy.skyeye.publics.consts.WebSocketKey;
import com.zhangy.skyeye.sar.context.SarTaskContextProvider; import com.zhangy.skyeye.sar.context.SarTaskContextProvider;
import com.zhangy.skyeye.sar.dto.JmSarWaveWsDTO; import com.zhangy.skyeye.sar.dto.JmSarWaveWsDTO;
@ -33,6 +34,9 @@ public class SarBackWsServiceImpl implements ISarBackWsService {
@Autowired @Autowired
private SarTaskContextProvider taskContextProvider; private SarTaskContextProvider taskContextProvider;
@Autowired
private JmJobStatusService jobStatusService;
@Override @Override
public void sendWave(String payloadIp, SarBackWaveFrameDTO frame, byte[] frameData) { public void sendWave(String payloadIp, SarBackWaveFrameDTO frame, byte[] frameData) {
JmSarWaveWsDTO wsVo = loadJobDetail(payloadIp, frame.getChannel(), frameData); JmSarWaveWsDTO wsVo = loadJobDetail(payloadIp, frame.getChannel(), frameData);
@ -55,7 +59,8 @@ public class SarBackWsServiceImpl implements ISarBackWsService {
* @return * @return
*/ */
private JmSarWaveWsDTO loadJobDetail(String payloadIp, JmSarWaveWsDTO ws, byte[] frameData) { private JmSarWaveWsDTO loadJobDetail(String payloadIp, JmSarWaveWsDTO ws, byte[] frameData) {
JmUavStatusDTO uav = taskContextProvider.getCurrentUav(payloadIp); // JmUavStatusDTO uav = taskContextProvider.getCurrentUav(payloadIp);
JmUavStatusDTO uav = jobStatusService.getCurrUav(payloadIp);
if (uav == null) { // 如果没有执行中的任务则忽略 if (uav == null) { // 如果没有执行中的任务则忽略
log.debug("IP={} 无正在执行的任务，忽略波形推送", payloadIp); log.debug("IP={} 无正在执行的任务，忽略波形推送", payloadIp);
return null; return null;