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

zhaowenyu

2025-11-26 f2c909e42b81bb7b589c956bfcf90dba3e16d0a8

 ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java

@@ -6,9 +6,11 @@
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.signal.SignalInfo;
import com.ard.work.domain.dto.state.UavState;
import com.ard.work.domain.dto.telemetry.TelemetryData;
import com.ard.work.domain.dto.wayline.WaylineInfo;
import com.ard.work.service.control.UavControlService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,10 +35,16 @@
        log.debug("获取无人机所有数据");
        Map<String, Object> map = new HashMap<>();
        map.put("boxSn", boxSn);

        WaylineInfo waylineInfo = UavWaylineCache.get(boxSn);
        map.put("wayline", waylineInfo);

        UavState uavState = UavStateCache.get(boxSn);
        map.put("state", uavState);

        TelemetryData uavTelemetryData = UavTelemetryDataCache.get(boxSn);
        map.put("telemetry", uavTelemetryData);

        SignalInfo uavSignalInfo = UavSignalInfoCache.get(boxSn);
        map.put("signal", uavSignalInfo);
        // 获取当前控制飞行的用户ID