From 1e2f717393e4053a3b8de11cbf67cd98a8c77ec1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 15 Nov 2025 15:34:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java
index 863171a..559d2aa 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java
+++ b/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;
@@ -12,15 +15,20 @@
import java.util.Map;
@Service
-public class UavControlManager extends BaseSubscriptionManager<Map<String, Long>> {
+public class UavControlManager extends BaseSubscriptionManager<Map<String, Object>> {
@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);
+ 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));
}
@@ -29,7 +37,7 @@
* 发送控制同意通知
*/
public void sendControlApproval(Long requesterId, String boxSn, String type) {
- UavControlMessage message = new UavControlMessage(boxSn, type, null,true);
+ UavControlMessage message = new UavControlMessage(boxSn, type, null, true);
BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", message);
WebSocketUtil.sendMessage(requesterId, JSON.toJSONString(baseMessage));
}
@@ -38,7 +46,7 @@
* 发送控制拒绝通知
*/
public void sendControlRejection(Long requesterId, String boxSn, String type) {
- UavControlMessage message = new UavControlMessage(boxSn, type, null,false);
+ UavControlMessage message = new UavControlMessage(boxSn, type, null, false);
BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", message);
WebSocketUtil.sendMessage(requesterId, JSON.toJSONString(baseMessage));
}
@@ -47,7 +55,7 @@
* 发送控制释放通知
*/
public void sendControlRelease(String boxSn, String type) {
- UavControlMessage message = new UavControlMessage(boxSn, type, null,null);
+ UavControlMessage message = new UavControlMessage(boxSn, type, null, null);
BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", message);
WebSocketUtil.sendMessageAll(JSON.toJSONString(baseMessage));
}
@@ -60,17 +68,20 @@
* @return 返回一个映射，包含无人机（fly）和载荷（payload）的当前控制者用户ID
*/
@Override
- protected Map<String, Long> getData(String boxSn) {
+ protected Map<String, Object> getData(String boxSn) {
// 获取当前控制飞行的用户ID
Long flyUserId = uavControlService.getCurrentController(boxSn, "fly");
// 获取当前控制载荷的用户ID
Long payloadUserId = uavControlService.getCurrentController(boxSn, "payload");
// 创建一个映射，用于存储飞行和载荷的当前控制者用户ID
- Map<String, Long> map=new HashMap<>();
+ 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;
}
--
Gitblit v1.9.3