From 208731a6c41b644186bb68c93c19ef7026284e3b Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 12 Mar 2026 16:04:43 +0800
Subject: [PATCH] 2026-03-09 优化标注功能 增加GeoCalculator计算工具类，算出面、圆的水平面积和水平周长，线的水平距离和直线距离。在调取按标注id获取标注详细信息接口给出，不入库。
---
ard-work/src/main/java/com/ard/work/domain/message/UavControlMessage.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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 b0d4324..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
@@ -1,10 +1,17 @@
package com.ard.work.domain.message;
+import com.ard.common.core.domain.entity.SysUser;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Map;
+
+/**
+ * 无人机控制消息
+ * @author lsy
+ * @date 2026/1/19
+ */
@Data
@AllArgsConstructor
@@ -13,18 +20,17 @@
private String boxSn; // 无人机编号
private String type; // 控制类型（fly 或 payload）
- private Long requester; // 申请者ID（仅在请求控制时使用）
- private Boolean approved; // 控制是否被批准（仅在处理请求控制时使用）
+ private String action; // request / approve / reject / release / takeover
- 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;
+ /** 本次动作的发起者（申请者 / 接管者） */
+ 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