From 145e705946adf1e47512f2450e8bdd42662751e6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 13 Dec 2025 09:38:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
index 2d376d4..c8873a4 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
@@ -42,6 +42,8 @@
@Resource
private UavAllManager uavAllManager;
@Resource
+ private NoFlyDistanceManager noFlyDistanceManager;
+ @Resource
private TokenService tokenService;
private final Map<Long, Long> lastDisconnectTime = new ConcurrentHashMap<>();
@@ -73,6 +75,9 @@
break;
case CONTROLLER:
handleControlMessage(payload, userId);
+ break;
+ case NO_FLY_DISTANCE:
+ handleNoFlyDistanceMessage(payload, userId);
break;
case ALL:
handleAllMessage(payload, userId);
@@ -272,6 +277,37 @@
}
}
+ /**
+ * 处理禁飞区距离
+ *
+ * @param payload 消息负载，包含订阅信息
+ * @param userId 用户ID，用于标识用户
+ */
+ private void handleNoFlyDistanceMessage(String payload, Long userId) {
+ // 解析接收到的JSON消息，将其转换为BaseMessage对象
+ BaseMessage<NoFlyDistanceMessage> baseMessage = JSON.parseObject(payload,
+ new TypeReference<BaseMessage<NoFlyDistanceMessage>>() {
+ });
+ // 获取消息的有效载荷部分
+ NoFlyDistanceMessage noFlyDistanceMessage = baseMessage.getPayload();
+
+ // 检查有效载荷是否存在
+ if (noFlyDistanceMessage != null) {
+ // 获取无人机盒子的序列号
+ String boxSn = noFlyDistanceMessage.getBoxSn();
+ // 根据消息中的订阅标志，决定是订阅还是退订无人机状态
+ Boolean subscribe = noFlyDistanceMessage.getSubscribe();
+ if (subscribe) {
+ // 执行订阅操作
+ noFlyDistanceManager.subscribe(boxSn, userId, 1);
+ } else {
+ // 执行退订操作
+ noFlyDistanceManager.unsubscribe(boxSn, userId);
+ }
+ }
+ }
+
+
@Override
public void afterConnectionEstablished(WebSocketSession session) {
String userIdStr = (String) session.getAttributes().get("userId");
--
Gitblit v1.9.3