From f96250ef45af8d4c8f52fed382da058ab9330bbf Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 21 三月 2024 16:59:14 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java | 402 +++++++++++++-------------------------------------------
1 files changed, 97 insertions(+), 305 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
index b483e6b..54e3330 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
@@ -1,24 +1,19 @@
package com.genersoft.iot.vmp.media.service.impl;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.genersoft.iot.vmp.common.CommonCallback;
+import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.conf.DynamicTask;
-import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
+import com.genersoft.iot.vmp.media.event.MediaServerChangeEvent;
+import com.genersoft.iot.vmp.media.event.MediaServerDeleteEvent;
import com.genersoft.iot.vmp.media.service.IMediaNodeServerService;
-import com.genersoft.iot.vmp.media.zlm.*;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.ServerKeepaliveData;
-import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
-import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -33,15 +28,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
import org.springframework.util.ObjectUtils;
-import java.io.File;
import java.time.LocalDateTime;
import java.util.*;
@@ -54,47 +45,14 @@
private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class);
- private final String zlmKeepaliveKeyPrefix = "zlm-keepalive_";
-
- @Autowired
- private SipConfig sipConfig;
-
@Autowired
private SSRCFactory ssrcFactory;
-
- @Value("${server.ssl.enabled:false}")
- private boolean sslEnabled;
-
- @Value("${server.port}")
- private Integer serverPort;
@Autowired
private UserSetting userSetting;
@Autowired
- private SendRtpPortManager sendRtpPortManager;
-
- @Autowired
- private AssistRESTfulUtils assistRESTfulUtils;
-
- @Autowired
private MediaServerMapper mediaServerMapper;
-
- @Autowired
- private DataSourceTransactionManager dataSourceTransactionManager;
-
- @Autowired
- private TransactionDefinition transactionDefinition;
-
-
- @Autowired
- private ZLMServerFactory zlmServerFactory;
-
- @Autowired
- private EventPublisher publisher;
-
- @Autowired
- private DynamicTask dynamicTask;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -107,6 +65,9 @@
@Autowired
private Map<String, IMediaNodeServerService> nodeServerServiceMap;
+
+ @Autowired
+ private ApplicationEventPublisher applicationEventPublisher;
/**
@@ -259,18 +220,28 @@
mediaServerMapper.update(mediaSerItem);
MediaServerItem mediaServerItemInRedis = getOne(mediaSerItem.getId());
MediaServerItem mediaServerItemInDataBase = mediaServerMapper.queryOne(mediaSerItem.getId());
- if (mediaServerItemInRedis == null || !ssrcFactory.hasMediaServerSSRC(mediaSerItem.getId())) {
+ if (mediaServerItemInDataBase == null) {
+ return;
+ }
+ mediaServerItemInDataBase.setStatus(mediaSerItem.isStatus());
+ if (mediaServerItemInRedis == null || !ssrcFactory.hasMediaServerSSRC(mediaServerItemInDataBase.getId())) {
ssrcFactory.initMediaServerSSRC(mediaServerItemInDataBase.getId(),null);
}
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItemInDataBase.getId();
redisTemplate.opsForValue().set(key, mediaServerItemInDataBase);
- if (mediaSerItem.isStatus()) {
- resetOnlineServerItem(mediaSerItem);
+ if (mediaServerItemInDataBase.isStatus()) {
+ resetOnlineServerItem(mediaServerItemInDataBase);
+ }else {
+ // 鍙戦�佷簨浠�
+ MediaServerChangeEvent event = new MediaServerChangeEvent(this);
+ event.setMediaServerItemList(mediaServerItemInDataBase);
+ applicationEventPublisher.publishEvent(event);
}
}
+
@Override
- public List<MediaServerItem> getAll() {
+ public List<MediaServerItem> getAllOnlineList() {
List<MediaServerItem> result = new ArrayList<>();
List<Object> mediaServerKeys = RedisUtil.scan(redisTemplate, String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX+ userSetting.getServerId() + "_" ));
String onlineKey = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
@@ -296,6 +267,21 @@
return sortResult;
});
return result;
+ }
+
+ @Override
+ public List<MediaServerItem> getAll() {
+ List<MediaServerItem> mediaServerList = mediaServerMapper.queryAll();
+ if (mediaServerList.isEmpty()) {
+ return new ArrayList<>();
+ }
+ for (MediaServerItem mediaServerItem : mediaServerList) {
+ MediaServerItem mediaServerItemInRedis = getOne(mediaServerItem.getId());
+ if (mediaServerItemInRedis != null) {
+ mediaServerItem.setStatus(mediaServerItemInRedis.isStatus());
+ }
+ }
+ return mediaServerList;
}
@@ -351,12 +337,15 @@
public void add(MediaServerItem mediaServerItem) {
mediaServerItem.setCreateTime(DateUtil.getNow());
mediaServerItem.setUpdateTime(DateUtil.getNow());
- mediaServerItem.setHookAliveInterval(30f);
+ if (mediaServerItem.getHookAliveInterval() == null || mediaServerItem.getHookAliveInterval() == 0F) {
+ mediaServerItem.setHookAliveInterval(10F);
+ }
if (mediaServerItem.getType() == null) {
logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, mediaServerItem鐨勭被鍨嬶細涓虹┖");
return;
}
if (mediaServerMapper.queryOne(mediaServerItem.getId()) != null) {
+ logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, 濯掍綋鏈嶅姟ID宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆, {}", mediaServerItem.getId());
throw new ControllerException(ErrorCode.ERROR100.getCode(),"淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + mediaServerItem.getId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
}
IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
@@ -364,133 +353,15 @@
logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
return;
}
- if (mediaNodeServerService.checkNodeId(mediaServerItem)) {
- mediaServerMapper.add(mediaServerItem);
+ mediaServerMapper.add(mediaServerItem);
+ if (mediaServerItem.isStatus()) {
mediaNodeServerService.online(mediaServerItem);
}else {
- throw new ControllerException(ErrorCode.ERROR100.getCode(),"淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + mediaServerItem.getId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ // 鍙戦�佷簨浠�
+ MediaServerChangeEvent event = new MediaServerChangeEvent(this);
+ event.setMediaServerItemList(mediaServerItem);
+ applicationEventPublisher.publishEvent(event);
}
- }
-
- @Override
- public int addToDatabase(MediaServerItem mediaSerItem) {
- return mediaServerMapper.add(mediaSerItem);
- }
-
- @Override
- public int updateToDatabase(MediaServerItem mediaSerItem) {
- int result = 0;
- if (mediaSerItem.isDefaultServer()) {
- TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
- int delResult = mediaServerMapper.delDefault();
- if (delResult == 0) {
- logger.error("绉婚櫎鏁版嵁搴撻粯璁ゅ獟浣撴湇鍔¤妭鐐硅妭鐐瑰け璐�");
- //浜嬪姟鍥炴粴
- dataSourceTransactionManager.rollback(transactionStatus);
- return 0;
- }
- result = mediaServerMapper.add(mediaSerItem);
- dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
- }else {
- result = mediaServerMapper.update(mediaSerItem);
- }
- return result;
- }
-
- /**
- * 澶勭悊濯掍綋鏈嶅姟鑺傜偣涓婄嚎
- * @param zlmServerConfig 濯掍綋鏈嶅姟鑺傜偣涓婄嚎鎼哄甫鐨勫弬鏁�
- */
- @Override
- public void zlmServerOnline(ZLMServerConfig zlmServerConfig) {
-
- MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
- if (serverItem == null) {
- logger.warn("[鏈敞鍐岀殑濯掍綋鏈嶅姟鑺傜偣] 鎷掓帴鎺ュ叆锛歿}鏉ヨ嚜{}锛歿}", zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
- logger.warn("璇锋鏌ュ獟浣撴湇鍔¤妭鐐圭殑ID閰嶇疆鏄惁涓嶹VP鐨�<media.id>涓�鑷�");
- return;
- }else {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 姝ｅ湪杩炴帴 : {} -> {}:{}",
- zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
- }
- serverItem.setHookAliveInterval(zlmServerConfig.getHookAliveInterval());
- if (serverItem.getHttpPort() == 0) {
- serverItem.setHttpPort(zlmServerConfig.getHttpPort());
- }
- if (serverItem.getHttpSSlPort() == 0) {
- serverItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
- }
- if (serverItem.getRtmpPort() == 0) {
- serverItem.setRtmpPort(zlmServerConfig.getRtmpPort());
- }
- if (serverItem.getRtmpSSlPort() == 0) {
- serverItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- }
- if (serverItem.getRtspPort() == 0) {
- serverItem.setRtspPort(zlmServerConfig.getRtspPort());
- }
- if (serverItem.getRtspSSLPort() == 0) {
- serverItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- }
- if (serverItem.getRtpProxyPort() == 0) {
- serverItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- }
- serverItem.setStatus(true);
-
- if (ObjectUtils.isEmpty(serverItem.getId())) {
- logger.warn("[鏈敞鍐岀殑濯掍綋鏈嶅姟鑺傜偣] serverItem缂哄皯ID锛� 鏃犳硶鎺ュ叆锛歿}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
- return;
- }
- mediaServerMapper.update(serverItem);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + zlmServerConfig.getGeneralMediaServerId();
- if (!ssrcFactory.hasMediaServerSSRC(serverItem.getId())) {
- ssrcFactory.initMediaServerSSRC(zlmServerConfig.getGeneralMediaServerId(), null);
- }
- redisTemplate.opsForValue().set(key, serverItem);
- resetOnlineServerItem(serverItem);
-
-
- if (serverItem.isAutoConfig()) {
- setZLMConfig(serverItem, "0".equals(zlmServerConfig.getHookEnable()));
- }
- final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId();
- dynamicTask.stop(zlmKeepaliveKey);
- dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (serverItem.getHookAliveInterval().intValue() + 5) * 1000);
- publisher.mediaServerOnlineEventPublish(serverItem.getId());
-
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 杩炴帴鎴愬姛 {} - {}:{} ",
- zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
- }
-
- class KeepAliveTimeoutRunnable implements Runnable{
-
- private MediaServerItem serverItem;
-
- public KeepAliveTimeoutRunnable(MediaServerItem serverItem) {
- this.serverItem = serverItem;
- }
-
- @Override
- public void run() {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣蹇冭烦鍒版湡]锛�" + serverItem.getId());
- // 鍙戣捣http璇锋眰楠岃瘉zlm鏄惁纭疄鏃犳硶杩炴帴锛屽鏋滅‘瀹炴棤娉曡繛鎺ュ垯鍙戦�佺绾夸簨浠讹紝鍚﹀垯涓嶄綔澶勭悊
- JSONObject mediaServerConfig = zlmresTfulUtils.getMediaServerConfig(serverItem);
- if (mediaServerConfig != null && mediaServerConfig.getInteger("code") == 0) {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣蹇冭烦鍒版湡]锛歿}楠岃瘉鍚庡獟浣撴湇鍔¤妭鐐逛粛鍦ㄧ嚎锛屾仮澶嶅績璺充俊鎭�,璇锋鏌ュ獟浣撴湇鍔¤妭鐐规槸鍚﹀彲浠ユ甯稿悜wvp鍙戦�佸績璺�", serverItem.getId());
- // 娣诲姞濯掍綋鏈嶅姟鑺傜偣淇℃伅
- updateMediaServerKeepalive(serverItem.getId(), null);
- }else {
- publisher.zlmOfflineEventPublish(serverItem.getId());
- }
- }
- }
-
-
- @Override
- public void zlmServerOffline(String mediaServerId) {
- delete(mediaServerId);
- final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerId;
- dynamicTask.stop(zlmKeepaliveKey);
}
@Override
@@ -573,111 +444,23 @@
return mediaServerItem;
}
- /**
- * 瀵瑰獟浣撴湇鍔¤妭鐐规湇鍔″櫒杩涜鍩虹閰嶇疆
- * @param mediaServerItem 鏈嶅姟ID
- * @param restart 鏄惁閲嶅惎濯掍綋鏈嶅姟鑺傜偣
- */
@Override
- public void setZLMConfig(MediaServerItem mediaServerItem, boolean restart) {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 姝ｅ湪璁剧疆 锛歿} -> {}:{}",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- String protocol = sslEnabled ? "https" : "http";
- String hookPrefix = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
-
- Map<String, Object> param = new HashMap<>();
- param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
- if (mediaServerItem.getRtspPort() != 0) {
- param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
- }
- param.put("hook.enable","1");
- param.put("hook.on_flow_report","");
- param.put("hook.on_play",String.format("%s/on_play", hookPrefix));
- param.put("hook.on_http_access","");
- param.put("hook.on_publish", String.format("%s/on_publish", hookPrefix));
- param.put("hook.on_record_ts","");
- param.put("hook.on_rtsp_auth","");
- param.put("hook.on_rtsp_realm","");
- param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrefix));
- param.put("hook.on_shell_login","");
- param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrefix));
- param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrefix));
- param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrefix));
- param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrefix));
- param.put("hook.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrefix));
- param.put("hook.on_rtp_server_timeout",String.format("%s/on_rtp_server_timeout", hookPrefix));
- param.put("hook.on_record_mp4",String.format("%s/on_record_mp4", hookPrefix));
- param.put("hook.timeoutSec","20");
- // 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆�
- // 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�)
- // 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿
- // 浼樺寲姝ゆ秷鎭互鏇村揩鐨勬敹鍒版祦娉ㄩ攢浜嬩欢
- param.put("protocol.continue_push_ms", "3000" );
- // 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
- // 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
- if (mediaServerItem.isRtpEnable() && !ObjectUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
- param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
- }
-
- if (!ObjectUtils.isEmpty(mediaServerItem.getRecordPath())) {
- File recordPathFile = new File(mediaServerItem.getRecordPath());
- param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath());
- param.put("protocol.downloadRoot", recordPathFile.getParentFile().getPath());
- param.put("record.appName", recordPathFile.getName());
- }
-
- JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
-
- if (responseJSON != null && responseJSON.getInteger("code") == 0) {
- if (restart) {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛,寮�濮嬮噸鍚互淇濊瘉閰嶇疆鐢熸晥 {} -> {}:{}",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- zlmresTfulUtils.restartServer(mediaServerItem);
- }else {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛 {} -> {}:{}",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- }
-
-
- }else {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆濯掍綋鏈嶅姟鑺傜偣澶辫触 {} -> {}:{}",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- }
-
-
- }
-
-
- @Override
- public MediaServerItem checkMediaServer(String ip, int port, String secret) {
+ public MediaServerItem checkMediaServer(String ip, int port, String secret, String type) {
if (mediaServerMapper.queryOneByHostAndPort(ip, port) != null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "姝よ繛鎺ュ凡瀛樺湪");
}
- MediaServerItem mediaServerItem = new MediaServerItem();
- mediaServerItem.setIp(ip);
- mediaServerItem.setHttpPort(port);
- mediaServerItem.setSecret(secret);
- JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
- if (responseJSON == null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "杩炴帴澶辫触");
+
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(type);
+ if (mediaNodeServerService == null) {
+ logger.info("[closeRTPServer] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", type);
+ return null;
}
- JSONArray data = responseJSON.getJSONArray("data");
- ZLMServerConfig zlmServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
- if (zlmServerConfig == null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "璇诲彇閰嶇疆澶辫触");
+ MediaServerItem mediaServerItem = mediaNodeServerService.checkMediaServer(ip, port, secret);
+ if (mediaServerItem != null) {
+ if (mediaServerMapper.queryOne(mediaServerItem.getId()) != null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "濯掍綋鏈嶅姟ID [" + mediaServerItem.getId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ }
}
- if (mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId()) != null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "濯掍綋鏈嶅姟ID [" + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
- }
- mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpPort());
- mediaServerItem.setRtmpPort(zlmServerConfig.getRtmpPort());
- mediaServerItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- mediaServerItem.setRtspPort(zlmServerConfig.getRtspPort());
- mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- mediaServerItem.setStreamIp(ip);
- mediaServerItem.setHookIp(sipConfig.getIp().split(",")[0]);
- mediaServerItem.setSdpIp(ip);
return mediaServerItem;
}
@@ -702,46 +485,24 @@
@Override
public void delete(String id) {
+ mediaServerMapper.delOne(id);
redisTemplate.opsForZSet().remove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId(), id);
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + id;
redisTemplate.delete(key);
- }
- @Override
- public void deleteDb(String id){
- //鍚屾鍒犻櫎鏁版嵁搴撲腑鐨勬暟鎹�
- mediaServerMapper.delOne(id);
+ // 鍙戦�佽妭鐐圭Щ闄ら�氱煡
+ MediaServerDeleteEvent event = new MediaServerDeleteEvent(this);
+ event.setMediaServerId(id);
+ applicationEventPublisher.publishEvent(event);
}
@Override
- public void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data) {
- MediaServerItem mediaServerItem = getOne(mediaServerId);
- if (mediaServerItem == null) {
- // 缂撳瓨涓嶅瓨鍦紝浠庢暟鎹簱鏌ヨ锛屽鏋滄暟鎹簱涓嶅瓨鍦ㄥ垯鏄敊璇殑
- mediaServerItem = getOneFromDatabase(mediaServerId);
- if (mediaServerItem == null) {
- logger.warn("[鏇存柊濯掍綋鏈嶅姟鑺傜偣 淇濇椿淇℃伅] 娴佸獟浣搟}灏氭湭鍔犲叆浣跨敤,璇锋鏌ヨ妭鐐逛腑鏄惁鍚湁姝ゆ祦濯掍綋 ", mediaServerId);
- return;
- }
- // 濯掍綋鏈嶅姟鑺傜偣杩炴帴閲嶈瘯
- logger.warn("[鏇存柊濯掍綋鏈嶅姟鑺傜偣 淇濇椿淇℃伅]灏濊瘯閾炬帴zml id {}", mediaServerId);
- ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
- redisTemplate.opsForValue().set(key, mediaServerItem);
- resetOnlineServerItem(mediaServerItem);
- clearRTPServer(mediaServerItem);
- }
- final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerItem.getId();
- dynamicTask.stop(zlmKeepaliveKey);
- dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(mediaServerItem), (mediaServerItem.getHookAliveInterval().intValue() + 5) * 1000);
- }
-
- private MediaServerItem getOneFromDatabase(String mediaServerId) {
+ public MediaServerItem getOneFromDatabase(String mediaServerId) {
return mediaServerMapper.queryOne(mediaServerId);
}
@Override
public void syncCatchFromDatabase() {
- List<MediaServerItem> allInCatch = getAll();
+ List<MediaServerItem> allInCatch = getAllOnlineList();
List<MediaServerItem> allInDatabase = mediaServerMapper.queryAll();
Map<String, MediaServerItem> mediaServerItemMap = new HashMap<>();
@@ -772,4 +533,35 @@
public List<MediaServerItem> getAllWithAssistPort() {
return mediaServerMapper.queryAllWithAssistPort();
}
+
+
+ @Override
+ public boolean stopSendRtp(MediaServerItem mediaInfo, String app, String stream, String ssrc) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaInfo.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[stopSendRtp] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaInfo.getType());
+ return false;
+ }
+ return mediaNodeServerService.stopSendRtp(mediaInfo, app, stream, ssrc);
+ }
+
+ @Override
+ public boolean deleteRecordDirectory(MediaServerItem mediaServerItem, String app, String stream, String date, String fileName) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[stopSendRtp] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ return false;
+ }
+ return mediaNodeServerService.deleteRecordDirectory(mediaServerItem, app, stream, date, fileName);
+ }
+
+ @Override
+ public List<StreamInfo> getMediaList(MediaServerItem mediaServerItem, String app, String stream) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[getMediaList] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ return new ArrayList<>();
+ }
+ return mediaNodeServerService.getMediaList(mediaServerItem, app, stream);
+ }
}
--
Gitblit v1.8.0