From 28e060fd6f7377c3cbb1c8633a6ac9b8fd61cbcb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 10 一月 2024 14:42:30 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index 7fbe769..3ec8211 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -35,15 +35,19 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 瑙嗛浠ｇ悊涓氬姟
@@ -128,7 +132,13 @@
}
JSONArray dataArray = jsonObject.getJSONArray("data");
JSONObject mediaServerConfig = dataArray.getJSONObject(0);
+ if (ObjectUtils.isEmpty(param.getFfmpegCmdKey())) {
+ param.setFfmpegCmdKey("ffmpeg.cmd");
+ }
String ffmpegCmd = mediaServerConfig.getString(param.getFfmpegCmdKey());
+ if (ffmpegCmd == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "ffmpeg鎷夋祦浠ｇ悊鏃犳硶鑾峰彇ffmpeg cmd");
+ }
String schema = getSchemaFromFFmpegCmd(ffmpegCmd);
if (schema == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "ffmpeg鎷夋祦浠ｇ悊鏃犳硶浠巉fmpeg cmd涓幏鍙栧埌杈撳嚭鏍煎紡");
@@ -454,7 +464,7 @@
streamProxyMapper.deleteAutoRemoveItemByMediaServerId(mediaServerId);
// 绉婚櫎鎷夋祦浠ｇ悊鐢熸垚鐨勬祦淇℃伅
-// syncPullStream(mediaServerId);
+ syncPullStream(mediaServerId);
// 鎭㈠娴佷唬鐞�, 鍙煡鎵捐繖涓繖涓祦濯掍綋
List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnableInMediaServer(
@@ -560,4 +570,43 @@
return new ResourceBaseInfo(total, online);
}
+
+
+ @Scheduled(cron = "* 0/10 * * * ?")
+ public void asyncCheckStreamProxyStatus() {
+
+ List<MediaServerItem> all = mediaServerService.getAllOnline();
+
+ if (CollectionUtils.isEmpty(all)){
+ return;
+ }
+
+ Map<String, MediaServerItem> serverItemMap = all.stream().collect(Collectors.toMap(MediaServerItem::getId, Function.identity(), (m1, m2) -> m1));
+
+ List<StreamProxyItem> list = videoManagerStorager.getStreamProxyListForEnable(true);
+
+ if (CollectionUtils.isEmpty(list)){
+ return;
+ }
+
+ for (StreamProxyItem streamProxyItem : list) {
+
+ MediaServerItem mediaServerItem = serverItemMap.get(streamProxyItem.getMediaServerId());
+
+ // TODO 鏀寔鍏朵粬 schema
+ JSONObject mediaInfo = zlmresTfulUtils.isMediaOnline(mediaServerItem, streamProxyItem.getApp(), streamProxyItem.getStream(), "rtsp");
+
+ if (mediaInfo == null){
+ streamProxyItem.setStatus(false);
+ } else {
+ if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
+ streamProxyItem.setStatus(true);
+ } else {
+ streamProxyItem.setStatus(false);
+ }
+ }
+
+ updateStreamProxy(streamProxyItem);
+ }
+ }
}
--
Gitblit v1.8.0