From 842c0049ea8498ea4adb3ca119157561b4d7df4f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 17:26:37 +0800
Subject: [PATCH] 2025-12-08 zwy 整理设备属性设置无人机不在线时返回前端错误提示代码为自定义代码，设备已离线和机场代码共用一个，无法区分机场和无人机设备。
---
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