优化

liusuyi

2025-12-09 35495ee5392c705604b5a07242451f00db287a34

 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,8 +51,8 @@
            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("【ws】【{}】Received message: {}, size: {}", userId, payload,
                    WebSocketSessionManager.getOnlineUserCount());
            BaseMessage<?> baseMessage = JSON.parseObject(payload, BaseMessage.class);
            MessageType messageType = MessageType.fromString(baseMessage.getType());
            switch (messageType) {
@@ -89,7 +93,7 @@
     */
    private void handleHeartbeatMessage(String payload, Long userId) {

        WebSocketUtil.sendMessage(userId, "服务端收到：" + payload);
        WebSocketUtil.sendMessage(userId, payload);
    }

    /**
@@ -270,45 +274,49 @@

    @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 控制权
        uavControlService.releaseAllControls(userId);
        uavStreamManager.stopAllPullStreamByUser(userId);
        uavStateManager.removeSubscribe(userId);
        uavTelemetryManager.removeSubscribe(userId);
        uavSignalManager.removeSubscribe(userId);
        uavControlManager.removeSubscribe(userId);

        // 延迟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) {
                    uavControlService.releaseAllControls(userId);
                    uavStreamManager.stopAllPullStreamByUser(userId);
                    uavStateManager.removeSubscribe(userId);
                    uavTelemetryManager.removeSubscribe(userId);
                    uavSignalManager.removeSubscribe(userId);
                    uavControlManager.removeSubscribe(userId);
                    tokenService.delLoginUser(loginUser.getToken(), userId);
                    log.info("【cmd】用户 [{}] 超时未重连，已删除 token", userId);
                }