From 1050a0dbace06b1510d53de5baedfc0ca07c8d71 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 02 Mar 2026 08:26:19 +0800
Subject: [PATCH] 2026-03-02 优化航线轨迹，没有任务的情况下，不记录轨迹信息
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
index 76efd4f..8e56522 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
@@ -2,19 +2,21 @@
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
+import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
+import com.ard.sample.component.websocket.handler.LiveStreamHandler;
import com.ard.sample.manage.model.dto.DeviceDTO;
+import com.ard.sample.manage.model.dto.LiveDTO;
+import com.ard.sample.manage.model.dto.LiveTypeDTO;
import com.ard.sample.manage.service.IDeviceService;
+import com.ard.sample.manage.service.ILiveStreamService;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.net.URL;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,6 +35,12 @@
@Autowired
protected ObjectMapper _objectMapper;
+ @Autowired
+ private LiveStreamHandler _liveStreamHandler;
+
+ @Autowired
+ private ILiveStreamService _liveStreamService;
+
/**
* 定时任务，每2秒取一次机场设备的在线状态，如已离线更新状态
* */
@@ -49,11 +57,18 @@
RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getDeviceSn());
RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + device.getDeviceSn());
}
+ else {
+ StartLiveStreaming(device.getDeviceSn());
+ }
if(!_deviceService.checkDeviceOnline(device.getChildDeviceSn())){
_deviceService.updateWorkType(device.getChildDeviceSn(), 6L);
RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getChildDeviceSn());
RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + device.getChildDeviceSn());
}
+ else{
+ StartLiveStreaming(device.getChildDeviceSn());
+ }
+
}
}
@@ -61,7 +76,7 @@
* 定时任务，每1秒读一次redis的机场设备的状态，并发送到websocket客户端
* */
//@Scheduled(cron = "0/1 * * * * ?")
- @Scheduled(initialDelay = 2, fixedRate = 1, timeUnit = TimeUnit.SECONDS)
+ @Scheduled(initialDelay = 2, fixedRate = 3, timeUnit = TimeUnit.SECONDS)
public void sendDeviceStatus(){
// 测试 机场oss读取文件
// URL url = _ossService.getObjectUrl("kmz","/2025/11/25/新建航点航线(1)_20251125161322A001.kmz");
@@ -110,4 +125,45 @@
return jsonString;
}
+
+ public void StartLiveStreaming(String sn) {
+ //调用开始直播
+ ResponseResult rlive = null;
+ String resultLive = "";
+ try {
+ // 获取直播参数
+ LiveTypeDTO param = _liveStreamHandler.getLiveParam(sn);
+ // 判断param是否为空，不为空则返回正确的直播参数，为null则未获取直播参数，不为空则继续操作
+ if (param == null) {
+ log.info("SN: {}-未获取到直播参数param为null，无法开启直播！", sn);
+ return;
+ }
+ // 如果存在直播则读取直播地址返回
+ if (RedisOpsUtils.checkExist(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn)) {
+ resultLive = String.valueOf(RedisOpsUtils.get(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn));
+// log.info("SN: {}-redis中存在相机的播放地址信息，直接返回地址！", sn);
+ } else {
+// log.info("SN: {}-redis中未找到相机的播放地址信息！停止直播后再开启直播", sn);
+ _liveStreamHandler.StopLiveStreaming(sn);
+ // 如果不存在直播，则开始直播，并返回直播地址
+ rlive = _liveStreamService.liveStart(param);
+ if (rlive.getCode() == 0) {
+ // 直播成功后，在redis中存一个标记，将videoid保留，留给停止直播使用
+ log.info("SN: {}-开启直播成功！", sn);
+ rlive.setGateway(sn);
+ rlive.setType(MessageType.LIVESTREAM.getType());
+ resultLive = _objectMapper.writeValueAsString(rlive);
+ RedisOpsUtils.set(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn, resultLive);
+ LiveDTO live = (LiveDTO) rlive.getData();
+ Boolean isWeb = _deviceService.updateWebrtcUrl(sn,live.getWebrtcUrl());
+// if (isWeb) {
+// log.info("SN: {}-更新webrtc地址成功！", sn);
+// }
+ }
+ }
+ } catch (Exception e) {
+ log.info("订时任务推流-SN: {}-开启直播失败！原因：{}", sn, e.getMessage());
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.9.3