From f7fea3eb2a6fe2b91d83ecee30304d6d0f6b9877 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 12:58:03 +0800
Subject: [PATCH] 2026-03-09 标记功能接口调整： 1、ID改为UUID； 2、点、线、面、圆数据增加索引字段sort，以标注各点的顺序； 3、增加is_true字段，用于标记是否在地图上可见；
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
index 8a1c7c2..9e60142 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
@@ -57,14 +57,18 @@
map.put("signal", uavSignalInfo);
// 获取当前控制飞行的用户ID
Long flyUserId = uavControlService.getCurrentController(boxSn, "fly");
- SysUser flyUser = redisCache.getCacheMapValue(CacheConstants.SYS_USER, flyUserId.toString());
- // 将飞行当前控制者用户ID添加到映射中
- map.put("flyController", flyUser);
+ if(flyUserId!=null) {
+ SysUser flyUser = redisCache.getCacheMapValue(CacheConstants.SYS_USER, flyUserId.toString());
+ // 将飞行当前控制者用户ID添加到映射中
+ map.put("flyController", flyUser);
+ }
// 获取当前控制载荷的用户ID
Long payloadUserId = uavControlService.getCurrentController(boxSn, "payload");
- SysUser payloadUser = redisCache.getCacheMapValue(CacheConstants.SYS_USER, payloadUserId.toString());
- // 将载荷当前控制者用户ID添加到映射中
- map.put("payloadController", payloadUser);
+ if(payloadUserId!=null) {
+ SysUser payloadUser = redisCache.getCacheMapValue(CacheConstants.SYS_USER, payloadUserId.toString());
+ // 将载荷当前控制者用户ID添加到映射中
+ map.put("payloadController", payloadUser);
+ }
return map;
}
--
Gitblit v1.9.3