增加部门区域管理业务和无人机实时位置所属区域推送

liusuyi

2026-04-22 04a270ff2b5919127524913ffc45c59c6c6d9201

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

@@ -3,11 +3,10 @@
import com.ard.common.constant.CacheConstants;
import com.ard.common.core.domain.entity.SysUser;
import com.ard.common.core.redis.RedisCache;
import com.ard.data.region.domain.ArdDeptRegion;
import com.ard.data.region.service.IArdDeptRegionService;
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;
import com.ard.work.domain.cache.UavWaylineCache;
import com.ard.work.domain.cache.*;
import com.ard.work.domain.dto.signal.SignalInfo;
import com.ard.work.domain.dto.state.UavState;
import com.ard.work.domain.dto.telemetry.TelemetryData;
@@ -57,14 +56,21 @@
        map.put("signal", uavSignalInfo);
        // 获取当前控制飞行的用户ID
        Long flyUserId = uavControlService.getCurrentController(boxSn, "fly");
        SysUser flyUser = redisCache.getCacheMapValue(CacheConstants.SYS_USER, flyUserId.toString());
        // 将飞行当前控制者用户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.getCacheMapValue(CacheConstants.SYS_USER, payloadUserId.toString());
        // 将载荷当前控制者用户ID添加到映射中
        map.put("payloadController", payloadUser);
        if(payloadUserId!=null) {
            SysUser payloadUser = redisCache.getCacheMapValue(CacheConstants.SYS_USER, payloadUserId.toString());
            // 将载荷当前控制者用户ID添加到映射中
            map.put("payloadController", payloadUser);
        }
        // 获取当前无人机所属区域
        ArdDeptRegion ardDeptRegion = UavRegionCache.get(boxSn);
        map.put("region", ardDeptRegion);
        return map;
    }