Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-26 f2c909e42b81bb7b589c956bfcf90dba3e16d0a8

 ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java

@@ -29,6 +29,7 @@
import com.ard.work.domain.cache.UavSignalInfoCache;
import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
import com.ard.work.domain.cache.UavWaylineCache;
import com.ard.work.domain.dto.BoxHistoryDTO;
import com.ard.work.domain.dto.BoxPhotosDTO;
import com.ard.work.domain.dto.BoxSettingsDTO;
@@ -614,8 +615,8 @@
        if (ardDroneInfo == null) {
            throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
        }
        FlyRoundControlCmd flyPointControlCmd = new FlyRoundControlCmd(flyRoundControlDTO);
        this.sendMessage(ardDroneInfo.getServerId(), flyPointControlCmd);
        FlyRoundControlCmd flyRoundControlCmd = new FlyRoundControlCmd(flyRoundControlDTO);
        this.sendMessage(ardDroneInfo.getServerId(), flyRoundControlCmd);
        return true;
    }

@@ -941,6 +942,11 @@
                // 处理无人机状态消息
                UavStateCmd uavStateCmd = (UavStateCmd) tyCommand;
                UavStateCache.put(uavStateCmd.getUavState());
                int flightMode = uavStateCmd.getUavState().getFlightControllerState().getFlightMode();
                if (flightMode != 14) {
                    //不在航线中 移除航线信息
                    UavWaylineCache.remove(uavStateCmd.getUavState().getBoxSn());
                }
                //logPrint("无人机状态", uavStateCmd.getUavState().getBoxSn());
                // WebSocketUtil.sendMessageAll(uavStateCmd.getUavState());
                break;