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

zhaowenyu

2026-02-05 04de920362c9dcc1cc6077b54acba8eeff5090fd

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

@@ -637,6 +637,9 @@
    /**
     * 环绕飞行控制
     */
//    @CheckControlRight(UavControlType.FLY)
//    @CheckTakeoffAltitude
//    @CheckNoFlyZone
    @Override
    public Boolean FlyRoundControl(FlyRoundControlDTO flyRoundControlDTO) {
        String boxSn = flyRoundControlDTO.getBoxSn();
@@ -978,7 +981,6 @@
                // 处理无人机遥测消息
                UavTelemetryDataCmd uavTelemetryDataCmd = (UavTelemetryDataCmd) tyCommand;
                TelemetryData telemetryData = uavTelemetryDataCmd.getTelemetryData();
                //telemetryData.setTimestamp(System.currentTimeMillis());//由于六合提供的状态时间戳不准，先以接收状态作为时间戳
                UavTelemetryDataCache.put(telemetryData);
                //logPrint("无人机遥测", uavTelemetryDataCmd.getTelemetryData().getBoxSn());
                //WebSocketUtil.sendMessageAll(uavTelemetryDataCmd.getTelemetryData());