From 0752ef5b8ff0ebdad5538ef32f59f08f0b679cbc Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 18 Oct 2025 11:07:32 +0800
Subject: [PATCH] 优化websocket订阅
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 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 36a3023..ca41681 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
@@ -80,10 +80,10 @@
*/
private void handleStreamMessage(String payload, Long userId) {
// 解析JSON负载数据为BaseMessage对象，包含UavStreamMessage类型的有效载荷
- BaseMessage<UavStreamMessage> streamMessage = JSON.parseObject(payload,
+ BaseMessage<UavStreamMessage> baseMessage = JSON.parseObject(payload,
new TypeReference<BaseMessage<UavStreamMessage>>() {
});
- UavStreamMessage uavStreamMessage = streamMessage.getPayload();
+ UavStreamMessage uavStreamMessage = baseMessage.getPayload();
// 检查解析后的UavStreamMessage对象是否非空
if (uavStreamMessage != null) {
@@ -107,11 +107,11 @@
*/
private void handleStateMessage(String payload, Long userId) {
// 解析接收到的JSON消息，将其转换为BaseMessage对象
- BaseMessage<UavStateMessage> stateMessage = JSON.parseObject(payload,
+ BaseMessage<UavStateMessage> baseMessage = JSON.parseObject(payload,
new TypeReference<BaseMessage<UavStateMessage>>() {
});
// 获取消息的有效载荷部分
- UavStateMessage uavStateMessage = stateMessage.getPayload();
+ UavStateMessage uavStateMessage = baseMessage.getPayload();
// 检查有效载荷是否存在
if (uavStateMessage != null) {
@@ -138,11 +138,11 @@
*/
private void handleTelemetryMessage(String payload, Long userId) {
// 解析接收到的JSON消息，将其转换为BaseMessage对象
- BaseMessage<UavTelemetryMessage> telemetryMessage = JSON.parseObject(payload,
+ BaseMessage<UavTelemetryMessage> baseMessage = JSON.parseObject(payload,
new TypeReference<BaseMessage<UavTelemetryMessage>>() {
});
// 获取消息的有效载荷部分
- UavTelemetryMessage uavTelemetryMessage = telemetryMessage.getPayload();
+ UavTelemetryMessage uavTelemetryMessage = baseMessage.getPayload();
// 检查有效载荷是否存在
if (uavTelemetryMessage != null) {
@@ -169,11 +169,11 @@
*/
private void handleSignalMessage(String payload, Long userId) {
// 解析接收到的JSON消息，将其转换为BaseMessage对象
- BaseMessage<UavSignalMessage> signalMessage = JSON.parseObject(payload,
+ BaseMessage<UavSignalMessage> baseMessage = JSON.parseObject(payload,
new TypeReference<BaseMessage<UavSignalMessage>>() {
});
// 获取消息的有效载荷部分
- UavSignalMessage uavSignalMessage = signalMessage.getPayload();
+ UavSignalMessage uavSignalMessage = baseMessage.getPayload();
// 检查有效载荷是否存在
if (uavSignalMessage != null) {
@@ -200,11 +200,11 @@
*/
private void handleControlMessage(String payload, Long userId) {
// 解析接收到的JSON消息，将其转换为BaseMessage对象
- BaseMessage<UavControlMessage> controlMessage = JSON.parseObject(payload,
+ BaseMessage<UavControlMessage> baseMessage = JSON.parseObject(payload,
new TypeReference<BaseMessage<UavControlMessage>>() {
});
// 获取消息的有效载荷部分
- UavControlMessage uavControlMessage = controlMessage.getPayload();
+ UavControlMessage uavControlMessage = baseMessage.getPayload();
// 检查有效载荷是否存在
if (uavControlMessage != null) {
@@ -224,18 +224,18 @@
private void handleAllMessage(String payload, Long userId) {
// 解析接收到的JSON消息，将其转换为BaseMessage对象
- BaseMessage<UavControlMessage> controlMessage = JSON.parseObject(payload,
- new TypeReference<BaseMessage<UavControlMessage>>() {
+ BaseMessage<UavAllMessage> baseMessage = JSON.parseObject(payload,
+ new TypeReference<BaseMessage<UavAllMessage>>() {
});
// 获取消息的有效载荷部分
- UavControlMessage uavControlMessage = controlMessage.getPayload();
+ UavAllMessage uavAllMessage = baseMessage.getPayload();
// 检查有效载荷是否存在
- if (uavControlMessage != null) {
+ if (uavAllMessage != null) {
// 获取无人机盒子的序列号
- String boxSn = uavControlMessage.getBoxSn();
+ String boxSn = uavAllMessage.getBoxSn();
// 根据消息中的订阅标志，决定是订阅还是退订无人机状态
- Boolean subscribe = uavControlMessage.getSubscribe();
+ Boolean subscribe = uavAllMessage.getSubscribe();
if (subscribe) {
// 执行订阅操作
uavAllManager.subscribe(boxSn, userId, 1);
@@ -250,6 +250,9 @@
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);
WebSocketSessionManager.addSession(userId, session);
log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
@@ -274,4 +277,6 @@
uavSignalManager.removeSubscribe(userId);
uavControlManager.removeSubscribe(userId);
}
+
+
}
--
Gitblit v1.9.3