From 0a0174e3b784f7f9f7c3abfb419c23ee26709d0f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 14:29:42 +0800
Subject: [PATCH] 2026-04-01 优化机场列表，注释获取机场视频地址代码。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 eb0a911..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
@@ -1,9 +1,7 @@
package com.ard.sample.manage.service.impl;
-import com.ard.common.core.domain.model.LoginUser;
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
-import com.ard.common.utils.SecurityUtils;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
@@ -19,9 +17,6 @@
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;
@@ -52,7 +47,6 @@
@Scheduled(cron = "0/2 * * * * ?")
public void cronOnlineTask() {
List<DeviceDTO> devicesList = _deviceService.getDevicesTopoForWeb();
- LoginUser loginUser = SecurityUtils.getLoginUser();
for (DeviceDTO device : devicesList) {
//String key = "online:" + device.getDeviceSn();
//System.out.println("在线状态："+RedisOpsUtils.checkExist(key));
@@ -82,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");
@@ -139,6 +133,11 @@
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));
--
Gitblit v1.9.3