From 6c9ad02f19d5bd8e597bd23006bead9b9ebcd593 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 19 Nov 2025 13:21:52 +0800
Subject: [PATCH] 优化

---
 ard-work/src/main/java/com/ard/work/domain/message/UavControlMessage.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 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..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