From 04a270ff2b5919127524913ffc45c59c6c6d9201 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 22 Apr 2026 14:22:30 +0800
Subject: [PATCH] 增加部门区域管理业务和无人机实时位置所属区域推送
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 9e60142..103d511 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
@@ -3,11 +3,10 @@
import com.ard.common.constant.CacheConstants;
import com.ard.common.core.domain.entity.SysUser;
import com.ard.common.core.redis.RedisCache;
+import com.ard.data.region.domain.ArdDeptRegion;
+import com.ard.data.region.service.IArdDeptRegionService;
import com.ard.work.config.RouteStateMachineService;
-import com.ard.work.domain.cache.UavSignalInfoCache;
-import com.ard.work.domain.cache.UavStateCache;
-import com.ard.work.domain.cache.UavTelemetryDataCache;
-import com.ard.work.domain.cache.UavWaylineCache;
+import com.ard.work.domain.cache.*;
import com.ard.work.domain.dto.signal.SignalInfo;
import com.ard.work.domain.dto.state.UavState;
import com.ard.work.domain.dto.telemetry.TelemetryData;
@@ -69,6 +68,9 @@
// 将载荷当前控制者用户ID添加到映射中
map.put("payloadController", payloadUser);
}
+ // 获取当前无人机所属区域
+ ArdDeptRegion ardDeptRegion = UavRegionCache.get(boxSn);
+ map.put("region", ardDeptRegion);
return map;
}
--
Gitblit v1.9.3