From da3e63a308e4b209d53b049074d47f0c04b0bb30 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 09 Dec 2025 11:22:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 6d9f21e..93e7bc4 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
@@ -17,7 +17,10 @@
import org.springframework.web.socket.handler.TextWebSocketHandler;
import javax.annotation.Resource;
+import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
@Component
@@ -40,15 +43,15 @@
private UavAllManager uavAllManager;
@Resource
private TokenService tokenService;
-
+ private final Map<Long, Long> lastDisconnectTime = new ConcurrentHashMap<>();
@Override
public void handleTextMessage(WebSocketSession session, TextMessage message) {
try {
String userIdStr = (String) session.getAttributes().get("userId");
Long userId = Long.parseLong(userIdStr);
String payload = message.getPayload();
- log.info("【cmd】Received message: {}", payload);
- log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
+ log.info("【cmd】Received【{}】message: {} size: {}", userId, payload,
+ WebSocketSessionManager.getOnlineUserCount());
BaseMessage<?> baseMessage = JSON.parseObject(payload, BaseMessage.class);
MessageType messageType = MessageType.fromString(baseMessage.getType());
switch (messageType) {
@@ -276,6 +279,7 @@
return;
}
Long userId = Long.parseLong(userIdStr);
+ lastDisconnectTime.remove(userId); // 清除断开标记
WebSocketSessionManager.addSession(userId, session);
log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
}
@@ -290,15 +294,20 @@
Long userId = Long.parseLong(userIdStr);
WebSocketSessionManager.removeSession(userId);
log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
+ long version = System.currentTimeMillis();
+ lastDisconnectTime.put(userId, version);
// 释放该用户所有 UAV 控制权
// 延迟10秒删除token（若期间没重连）
CompletableFuture.runAsync(() -> {
try {
- Thread.sleep(10_000); // 延迟10秒
+ Thread.sleep(3_000); // 延迟3秒
} catch (InterruptedException ignored) {
}
-
+ // 如果版本号不一致，说明用户曾重连 → 不执行删除
+ if (!Objects.equals(lastDisconnectTime.get(userId), version)) {
+ return;
+ }
if (!WebSocketSessionManager.containsUser(userId)) {
LoginUser loginUser = tokenService.getLoginUserByUserId(userId);
if (loginUser != null) {
--
Gitblit v1.9.3