From 3c8d6b8e60f02b9a40fc5acd4dc6c34a6b594eb6 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 19 Jan 2026 11:23:32 +0800
Subject: [PATCH] 增加用户优先级和所属平台 调整无人机控制逻辑增加优先级判断
---
ard-work/src/main/java/com/ard/work/domain/message/UavControlMessage.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
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 981895b..e880328 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
@@ -7,6 +7,12 @@
import java.util.Map;
+/**
+ * 无人机控制消息
+ * @author lsy
+ * @date 2026/1/19
+ */
+
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -14,20 +20,17 @@
private String boxSn; // 无人机编号
private String type; // 控制类型（fly 或 payload）
- private Long requesterId; // 申请者ID（仅在请求控制时使用）
- private SysUser requester; // 申请者实体
- private Boolean approved; // 控制是否被批准（仅在处理请求控制时使用）
- /**
- * 是否订阅
- */
- private Boolean subscribe;
- private Map<String, Long> controller;
+ private String action; // request / approve / reject / release / takeover
- public UavControlMessage(String boxSn, String type, Long requesterId, Boolean approved) {
- this.boxSn = boxSn;
- this.type = type;
- this.requesterId = requesterId;
- this.approved = approved;
- }
+ /** 本次动作的发起者（申请者 / 接管者） */
+ private Long operatorId;
+ private SysUser operator;
+ /** 当前控制者 */
+ private Long controllerId;
+ private SysUser controller;
+
+ private Boolean approved; // true / false
+
+ private Boolean subscribe; // true 表示订阅，false 表示取消订阅
}
--
Gitblit v1.9.3