优化

liusuyi

2026-04-01 99647c423596c86a314cb43edb5a6fb70817cca6

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

@@ -3,6 +3,7 @@
import com.ard.common.constant.CacheConstants;
import com.ard.common.core.domain.entity.SysUser;
import com.ard.common.core.redis.RedisCache;
import com.ard.work.config.RouteStateMachineService;
import com.ard.work.domain.cache.UavSignalInfoCache;
import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
@@ -11,6 +12,7 @@
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.domain.enums.RouteState;
import com.ard.work.service.control.UavControlService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +31,8 @@
    private UavControlService uavControlService;
    @Autowired
    private RedisCache redisCache;
    @Autowired
    private RouteStateMachineService stateMachineService;

    @Override
    protected Map<String, Object> getData(String boxSn) {
@@ -37,6 +41,10 @@
        map.put("boxSn", boxSn);

        WaylineInfo waylineInfo = UavWaylineCache.get(boxSn);
        if (waylineInfo != null) {
            RouteState currentState = stateMachineService.getCurrentState(boxSn);
            waylineInfo.setRouteState(currentState);
        }
        map.put("wayline", waylineInfo);

        UavState uavState = UavStateCache.get(boxSn);
@@ -49,14 +57,18 @@
        map.put("signal", uavSignalInfo);
        // 获取当前控制飞行的用户ID
        Long flyUserId = uavControlService.getCurrentController(boxSn, "fly");
        SysUser flyUser = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + flyUserId);
        // 将飞行当前控制者用户ID添加到映射中
        map.put("flyController", flyUser);
        if(flyUserId!=null) {
            SysUser flyUser = redisCache.getCacheMapValue(CacheConstants.SYS_USER, flyUserId.toString());
            // 将飞行当前控制者用户ID添加到映射中
            map.put("flyController", flyUser);
        }
        // 获取当前控制载荷的用户ID
        Long payloadUserId = uavControlService.getCurrentController(boxSn, "payload");
        SysUser payloadUser = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + payloadUserId);
        // 将载荷当前控制者用户ID添加到映射中
        map.put("payloadController", payloadUser);
        if(payloadUserId!=null) {
            SysUser payloadUser = redisCache.getCacheMapValue(CacheConstants.SYS_USER, payloadUserId.toString());
            // 将载荷当前控制者用户ID添加到映射中
            map.put("payloadController", payloadUser);
        }
        return map;
    }