From 35495ee5392c705604b5a07242451f00db287a34 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 09 Dec 2025 11:42:37 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 b59b3d9..2d376d4 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,6 +43,7 @@
private UavAllManager uavAllManager;
@Resource
private TokenService tokenService;
+ private final Map<Long, Long> lastDisconnectTime = new ConcurrentHashMap<>();
@Override
public void handleTextMessage(WebSocketSession session, TextMessage message) {
@@ -47,7 +51,7 @@
String userIdStr = (String) session.getAttributes().get("userId");
Long userId = Long.parseLong(userIdStr);
String payload = message.getPayload();
- log.info("【cmd】Received【{}】message: {} size: {}", userId, payload,
+ log.info("【ws】【{}】Received message: {}, size: {}", userId, payload,
WebSocketSessionManager.getOnlineUserCount());
BaseMessage<?> baseMessage = JSON.parseObject(payload, BaseMessage.class);
MessageType messageType = MessageType.fromString(baseMessage.getType());
@@ -270,35 +274,40 @@
@Override
public void afterConnectionEstablished(WebSocketSession session) {
- log.info("【cmd】Connected: {}", session.getId());
String userIdStr = (String) session.getAttributes().get("userId");
if (userIdStr == null || userIdStr.isBlank()) {
return;
}
Long userId = Long.parseLong(userIdStr);
+ lastDisconnectTime.remove(userId); // 清除断开标记
WebSocketSessionManager.addSession(userId, session);
- log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
+ log.info("【ws】【{}】Connected,size: {}",userId, WebSocketSessionManager.getOnlineUserCount());
}
@Override
public void afterConnectionClosed(WebSocketSession session, CloseStatus status) {
- log.info("【cmd】Disconnected: {}", session.getId());
+
String userIdStr = (String) session.getAttributes().get("userId");
if (userIdStr == null || userIdStr.isBlank()) {
return;
}
Long userId = Long.parseLong(userIdStr);
WebSocketSessionManager.removeSession(userId);
- log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
+ log.info("【ws】【{}】Disconnected,size: {}",userId, 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