From 5df4bed1049b7ae758e3d5006bf3c312014ad4c3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 29 Oct 2025 16:40:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/message/UavControlMessage.java | 19 +++++++++++--------
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavControlManager.java | 26 ++++++++++++++++++--------
2 files changed, 29 insertions(+), 16 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..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, 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);
+ 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));
}
@@ -66,12 +74,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;
}
diff --git a/ard-work/src/main/java/com/ard/work/domain/message/UavControlMessage.java b/ard-work/src/main/java/com/ard/work/domain/message/UavControlMessage.java
index b0d4324..981895b 100644
--- a/ard-work/src/main/java/com/ard/work/domain/message/UavControlMessage.java
+++ b/ard-work/src/main/java/com/ard/work/domain/message/UavControlMessage.java
@@ -1,5 +1,6 @@
package com.ard.work.domain.message;
+import com.ard.common.core.domain.entity.SysUser;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -13,18 +14,20 @@
private String boxSn; // 无人机编号
private String type; // 控制类型（fly 或 payload）
- private Long requester; // 申请者ID（仅在请求控制时使用）
+ private Long requesterId; // 申请者ID（仅在请求控制时使用）
+ private SysUser requester; // 申请者实体
private Boolean approved; // 控制是否被批准（仅在处理请求控制时使用）
-
- public UavControlMessage(String boxSn, String type, Long requester, Boolean approved) {
- this.boxSn = boxSn;
- this.type = type;
- this.requester = requester;
- this.approved = approved;
- }
/**
* 是否订阅
*/
private Boolean subscribe;
private Map<String, Long> controller;
+
+ public UavControlMessage(String boxSn, String type, Long requesterId, Boolean approved) {
+ this.boxSn = boxSn;
+ this.type = type;
+ this.requesterId = requesterId;
+ this.approved = approved;
+ }
+
}
--
Gitblit v1.9.3