From d68181ce2faef4821d6d8a8ffb8027480a6262c3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 05 Nov 2025 17:01:20 +0800
Subject: [PATCH] 2025-11-5 zwy websockeet增加Type:livestream,开启机场和飞行器的直播接口， 增加LiveStreamHandler对开启直播和关闭直播的处理； redis增加WEBSOCKET_VideoId_PREFIX，存储videoid，关闭直播功能时使用；
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index 130b9c9..bb5f7fd 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -23,6 +23,7 @@
import com.ard.work.component.netty.command.wayline.*;
import com.ard.work.component.netty.handler.ErrorCodeEnum;
import com.ard.work.component.netty.protobuf.TelemetryDataPB;
+import com.ard.work.component.websocket.utils.WebSocketUtil;
import com.ard.work.domain.cache.UavSignalInfoCache;
import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
@@ -45,6 +46,8 @@
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.domain.entity.ArdDroneInfo;
import com.ard.work.domain.entity.ArdServerInfo;
+import com.ard.work.domain.message.BaseMessage;
+import com.ard.work.domain.message.ServerReplyMessage;
import com.ard.work.domain.message.UavControlType;
import com.ard.work.domain.receiver.*;
import com.ard.work.service.IArdDroneInfoService;
@@ -91,7 +94,7 @@
*/
@Override
public List<BoxInfoReceiver> getBoxList() {
- List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerInfoList(new ArdServerInfo());
+ List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerInfoList(new ArdServerInfo() {{ setUseDataScope(false); }});
return getBoxList(ardServerInfos);
}
@@ -901,21 +904,29 @@
//公共日志打印
private void logPrint(String message, Object obj) {
- log.debug("收到{}回复{}", message, obj);
+ String text = String.format("收到%s回复 %s", message, obj);
+ ServerReplyMessage serverReplyMessage = ServerReplyMessage.builder().message(text).build();
+ WebSocketUtil.sendMessage("reply", serverReplyMessage);
+ log.debug(text);
}
//公共日志打印
private void logPrint(String message, byte result, Integer errorCode) {
- log.info("收到{}回复:{} 错误码：{}【{}】",
+ String text = String.format(
+ "收到%s回复 状态码：%d【%s】",
message,
- ByteUtils.byteToHex(result),
+ //ByteUtils.byteToHex(result),
errorCode,
- ErrorCodeEnum.getDescByCode(errorCode));
+ ErrorCodeEnum.getDescByCode(errorCode)
+ );
+ ServerReplyMessage serverReplyMessage = ServerReplyMessage.builder().message(text).build();
+ WebSocketUtil.sendMessage("reply", serverReplyMessage);
+ log.debug(text);
}
/**
- * 发送消息
+ * 发送tcp消息
*/
private void sendMessage(String key, BaseCmd msg) {
TcpClientUtil.sendMessage(key, msg);
--
Gitblit v1.9.3