Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-12-09 da3e63a308e4b209d53b049074d47f0c04b0bb30

 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,7 +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) {
        try {
@@ -276,6 +279,7 @@
            return;
        }
        Long userId = Long.parseLong(userIdStr);
        lastDisconnectTime.remove(userId); // 清除断开标记
        WebSocketSessionManager.addSession(userId, session);
        log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
    }
@@ -290,6 +294,8 @@
        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（若期间没重连）
@@ -298,7 +304,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) {