From cf1d094cc68c60d03a7b4bc35a618b392b2bf956 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 21 Jan 2026 13:27:31 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java | 138 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 113 insertions(+), 25 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 4e56d46..86e880b 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,10 +1,12 @@
package com.ard.work.component.websocket.handler;
import com.alibaba.fastjson2.JSON;
-import com.ard.work.service.control.UavControlService;
-import com.ard.work.domain.message.BaseMessage;
-import com.ard.work.domain.message.UavControlMessage;
+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.component.websocket.utils.WebSocketUtil;
+import com.ard.work.domain.message.*;
+import com.ard.work.service.control.UavControlService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -12,42 +14,126 @@
import java.util.Map;
@Service
-public class UavControlManager extends BaseSubscriptionManager<Map<String, Object>> {
+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);
- BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", message);
- WebSocketUtil.sendMessage(controllerId, JSON.toJSONString(baseMessage));
+ public void sendControlRequest(Long controllerId, String boxSn, String type, Long requesterId) {
+
+ SysUser requester = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + requesterId);
+
+ UavControlMessage msg = new UavControlMessage();
+ msg.setBoxSn(boxSn);
+ msg.setType(type);
+ msg.setAction("request");
+ msg.setOperatorId(requesterId);
+ msg.setOperator(requester);
+
+ BaseMessage<UavControlMessage> base = new BaseMessage<>("control", msg);
+
+ WebSocketUtil.sendMessage(controllerId, JSON.toJSONString(base));
}
/**
- * 发送控制同意通知
+ * 同意控制
*/
- public void sendControlApproval(Long requesterId, String boxSn, String type) {
- UavControlMessage message = new UavControlMessage(boxSn, type, null,true);
- BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", message);
- WebSocketUtil.sendMessage(requesterId, JSON.toJSONString(baseMessage));
+ public void sendControlApproval(Long requesterId, String boxSn, String type, Long controllerId) {
+
+ SysUser controller = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + controllerId);
+
+ UavControlMessage msg = new UavControlMessage();
+ msg.setBoxSn(boxSn);
+ msg.setType(type);
+ msg.setAction("approve");
+ msg.setApproved(true);
+ msg.setController(controller);
+
+ BaseMessage<UavControlMessage> base = new BaseMessage<>("control", msg);
+
+ WebSocketUtil.sendMessage(requesterId, JSON.toJSONString(base));
}
/**
- * 发送控制拒绝通知
+ * 拒绝控制
*/
- public void sendControlRejection(Long requesterId, String boxSn, String type) {
- UavControlMessage message = new UavControlMessage(boxSn, type, null,false);
- BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", message);
- WebSocketUtil.sendMessage(requesterId, JSON.toJSONString(baseMessage));
+ public void sendControlRejection(Long requesterId, String boxSn, String type, Long controllerId) {
+
+ SysUser controller = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + controllerId);
+
+ UavControlMessage msg = new UavControlMessage();
+ msg.setBoxSn(boxSn);
+ msg.setType(type);
+ msg.setAction("reject");
+ msg.setApproved(false);
+ msg.setController(controller);
+
+ BaseMessage<UavControlMessage> base = new BaseMessage<>("control", msg);
+
+ WebSocketUtil.sendMessage(requesterId, JSON.toJSONString(base));
}
/**
- * 发送控制释放通知
+ * 控制权接管
*/
- public void sendControlRelease(String boxSn, String type) {
- UavControlMessage message = new UavControlMessage(boxSn, type, null,null);
+ public void sendControlTakeover(Long oldControllerId, Long newControllerId, String boxSn, String type) {
+
+ SysUser newController = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + newControllerId);
+ SysUser oldController = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + oldControllerId);
+
+ // 1️⃣ 通知原控制者：你被抢占了
+ UavControlMessage msgOld = new UavControlMessage();
+ msgOld.setBoxSn(boxSn);
+ msgOld.setType(type);
+ msgOld.setAction("takeover");
+ msgOld.setOperatorId(newControllerId);
+ msgOld.setOperator(newController);
+ msgOld.setControllerId(oldControllerId);
+ msgOld.setController(oldController);
+ BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", msgOld);
+ WebSocketUtil.sendMessage(oldControllerId, JSON.toJSONString(baseMessage));
+
+ // 2️⃣ 通知新控制者：你已获得控制权
+ UavControlMessage msgNew = new UavControlMessage();
+ msgNew.setBoxSn(boxSn);
+ msgNew.setType(type);
+ msgNew.setAction("approve"); // 或 "takeover" 也可
+ msgNew.setOperatorId(newControllerId);
+ msgNew.setOperator(newController);
+ baseMessage = new BaseMessage<>("control", msgNew);
+ WebSocketUtil.sendMessage(newControllerId, JSON.toJSONString(baseMessage));
+
+ // 3️⃣ 广播给观战用户（可选）
+ UavControlMessage msgBroadcast = new UavControlMessage();
+ msgBroadcast.setBoxSn(boxSn);
+ msgBroadcast.setType(type);
+ msgBroadcast.setAction("takeover");
+ msgBroadcast.setOperatorId(newControllerId);
+ msgBroadcast.setOperator(newController);
+ msgBroadcast.setControllerId(oldControllerId);
+ msgBroadcast.setController(oldController);
+ baseMessage = new BaseMessage<>("control", msgBroadcast);
+ WebSocketUtil.sendMessageAll(JSON.toJSONString(baseMessage));
+ }
+
+ /**
+ * 控制权释放
+ */
+ public void sendControlRelease(String boxSn, String type, Long operatorId) {
+ SysUser operator = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + operatorId);
+
+ UavControlMessage message = new UavControlMessage();
+ message.setBoxSn(boxSn);
+ message.setType(type);
+ message.setAction("release");
+ message.setOperatorId(operatorId);
+ message.setOperator(operator);
+
BaseMessage<UavControlMessage> baseMessage = new BaseMessage<>("control", message);
WebSocketUtil.sendMessageAll(JSON.toJSONString(baseMessage));
}
@@ -66,12 +152,14 @@
// 获取当前控制载荷的用户ID
Long payloadUserId = uavControlService.getCurrentController(boxSn, "payload");
// 创建一个映射，用于存储飞行和载荷的当前控制者用户ID
- Map<String, Object> 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