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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 ef5925e..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
@@ -94,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);
}
@@ -904,7 +904,7 @@
//公共日志打印
private void logPrint(String message, Object obj) {
- String text = String.format("收到%s回复%s", message, obj);
+ String text = String.format("收到%s回复 %s", message, obj);
ServerReplyMessage serverReplyMessage = ServerReplyMessage.builder().message(text).build();
WebSocketUtil.sendMessage("reply", serverReplyMessage);
log.debug(text);
@@ -913,9 +913,9 @@
//公共日志打印
private void logPrint(String message, byte result, Integer errorCode) {
String text = String.format(
- "收到%s回复:%s 错误码：%d【%s】",
+ "收到%s回复 状态码：%d【%s】",
message,
- ByteUtils.byteToHex(result),
+ //ByteUtils.byteToHex(result),
errorCode,
ErrorCodeEnum.getDescByCode(errorCode)
);
--
Gitblit v1.9.3