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

zhaowenyu

2025-12-09 82946c8521c4a371dcfff3def6f0027a6aa469ea

 ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java

@@ -44,13 +44,14 @@
    @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: {} 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());
@@ -273,7 +274,6 @@

    @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;
@@ -281,19 +281,19 @@
        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 控制权