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

zhaowenyu

2025-10-29 5df4bed1049b7ae758e3d5006bf3c312014ad4c3

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

@@ -1,6 +1,9 @@
package com.ard.work.component.websocket.handler;

import com.alibaba.fastjson2.JSON;
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.service.control.UavControlService;
import com.ard.work.domain.message.BaseMessage;
import com.ard.work.domain.message.UavControlMessage;
@@ -16,11 +19,16 @@

    @Resource
    private UavControlService uavControlService;
    @Resource
    private RedisCache redisCache;

    /**
     * 发送控制请求
     */
    public void sendControlRequest(Long controllerId, String boxSn, String type, Long requester) {
        UavControlMessage message = new UavControlMessage(boxSn, type, requester,null);
        SysUser sysUser = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + requester);
        message.setRequester(sysUser);
        BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", message);
        WebSocketUtil.sendMessage(controllerId, JSON.toJSONString(baseMessage));
    }
@@ -69,9 +77,11 @@
        Map<String, Object> map=new HashMap<>();
        map.put("boxSn", boxSn);
        // 将飞行当前控制者用户ID添加到映射中
        map.put("flyController", flyUserId);
        SysUser flyUser = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + flyUserId);
        map.put("flyController", flyUser);
        // 将载荷当前控制者用户ID添加到映射中
        map.put("payloadController", payloadUserId);
        SysUser payloadUser = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + payloadUserId);
        map.put("payloadController", payloadUser);
        // 返回包含当前控制者信息的映射
        return map;
    }