From dee32192e3436cdee86db3a25784ce195b0e99a5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 10 Mar 2026 15:24:03 +0800
Subject: [PATCH] 2026-03-09 优化 1、优化目录是否可见接口，修改目录时同步修改目录下属的所有标注是否可见。 2、优化controller接口返回数据字段。
---
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 b993a9a..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.getCacheObject(CacheConstants.SYS_USER_KEY + flyUserId);
- // 将飞行当前控制者用户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.getCacheObject(CacheConstants.SYS_USER_KEY + payloadUserId);
- // 将载荷当前控制者用户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