From 64d307134bfd5dfcc96a6bf363d385004ee33263 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 17 Jan 2026 16:18:47 +0800
Subject: [PATCH] 2026-01-17 zwy 优化
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/WaylineTrajectoryServiceImpl.java | 2 +-
ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java | 4 ----
ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java | 4 ++++
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java
index 36ab8cc..2d39797 100644
--- a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java
+++ b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java
@@ -4,7 +4,6 @@
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.model.Payload;
import com.ard.sample.component.websocket.model.WebSocketMessage;
-import com.ard.sample.manage.service.IControlService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -31,9 +30,6 @@
@Autowired
private LiveStreamHandler _liveStreamService;
-
- @Autowired
- private IControlService _controlService;
// ====================== 心跳相关常量（可配置化建议放到配置文件） ======================
/** 心跳间隔（秒）：客户端需每隔此时间发送一次PING消息 */
diff --git a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
index 8d79eba..0cfc482 100644
--- a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
+++ b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
@@ -65,6 +65,9 @@
log.info("SN: {}-更新webrtc地址成功！", sn);
}
}
+ else {
+ log.info("SN: {}-开启直播失败！返回值：{}", sn, rlive);
+ }
}
_dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive, userId);
log.info("SN: {}-直播地址：{}", sn, resultLive);
@@ -82,6 +85,7 @@
LiveTypeDTO param = getLiveParam(sn);
// 停止直播逻辑
rlive = _liveStreamService.liveStop(param.getVideoId());
+ log.info("SN: {}-停止直播！返回值：{}", sn, rlive);
// rlive.setGateway(sn);
// rlive.setType(MessageType.LIVESTREAM.getType());
// resultLive = _objectMapper.writeValueAsString(rlive);
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/WaylineTrajectoryServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/WaylineTrajectoryServiceImpl.java
index 2a7efab..b3b9d8e 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/WaylineTrajectoryServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/WaylineTrajectoryServiceImpl.java
@@ -75,7 +75,7 @@
// 飞行轨迹数据
listTrajectory.add(dataJson);
log.info("SN:{} 轨迹点数据添加到列表缓存，当前列表数量：{}", sn, listTrajectory.size());
- log.info("SN:{} 轨迹点数据：{}", sn, dataJson);
+// log.info("SN:{} 轨迹点数据：{}", sn, dataJson);
}
if (type.equals("1")) {
// 任务状态数据
--
Gitblit v1.9.3