From 620a4803da1fa01ef02e17f4a9d5a997a7aa4830 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 18 三月 2024 23:56:27 +0800
Subject: [PATCH] 实现部分优化后的接口
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java | 62 +++++++++++++++++++++++++++++++
src/main/java/com/genersoft/iot/vmp/media/IMediaNodeServerService.java | 4 +-
src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java | 37 ++++++++++++++++++
src/main/java/com/genersoft/iot/vmp/media/impl/MediaServerServiceImpl.java | 3 +
4 files changed, 104 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/IMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/IMediaNodeServerService.java
index c72c7e2..992379d 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/IMediaNodeServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/IMediaNodeServerService.java
@@ -10,9 +10,9 @@
void closeRtpServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback);
- void closeStreams(MediaServerItem mediaServerItem, String rtp, String streamId);
+ void closeStreams(MediaServerItem mediaServerItem, String app, String stream);
- Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc);
+ Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String stream, String ssrc);
boolean checkNodeId(MediaServerItem mediaServerItem);
diff --git a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java
index 6e86153..0c65b2f 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java
@@ -1,8 +1,45 @@
package com.genersoft.iot.vmp.media.abl;
+import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.media.IMediaNodeServerService;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.stereotype.Service;
@Service("abl")
public class ABLMediaNodeServerService implements IMediaNodeServerService {
+
+ @Override
+ public int createRTPServer(MediaServerItem mediaServerItem, String streamId, long ssrc, Integer port, Boolean onlyAuto, Boolean reUsePort, Integer tcpMode) {
+ return 0;
+ }
+
+ @Override
+ public void closeRtpServer(MediaServerItem mediaServerItem, String streamId) {
+
+ }
+
+ @Override
+ public void closeRtpServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback) {
+
+ }
+
+ @Override
+ public void closeStreams(MediaServerItem mediaServerItem, String rtp, String streamId) {
+
+ }
+
+ @Override
+ public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
+ return null;
+ }
+
+ @Override
+ public boolean checkNodeId(MediaServerItem mediaServerItem) {
+ return false;
+ }
+
+ @Override
+ public void online(MediaServerItem mediaServerItem) {
+
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/media/impl/MediaServerServiceImpl.java
index 4e8ed27..4a03f1e 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/impl/MediaServerServiceImpl.java
@@ -352,6 +352,9 @@
logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, mediaServerItem鐨勭被鍨嬶細涓虹┖");
return;
}
+ if (mediaServerMapper.queryOne(mediaServerItem.getId()) != null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + mediaServerItem.getId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ }
IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
if (mediaNodeServerService == null) {
logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
index 4b9013c..7694967 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
@@ -1,9 +1,71 @@
package com.genersoft.iot.vmp.media.zlm;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.media.IMediaNodeServerService;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
@Service("zlm")
public class ZLMMediaNodeServerService implements IMediaNodeServerService {
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private ZLMServerFactory zlmServerFactory;
+
+ @Override
+ public int createRTPServer(MediaServerItem mediaServerItem, String streamId, long ssrc, Integer port, Boolean onlyAuto, Boolean reUsePort, Integer tcpMode) {
+ return zlmServerFactory.createRTPServer(mediaServerItem, streamId, ssrc, port, onlyAuto, reUsePort, tcpMode);;
+ }
+
+ @Override
+ public void closeRtpServer(MediaServerItem mediaServerItem, String streamId) {
+ zlmresTfulUtils.closeStreams(mediaServerItem, "rtp", streamId);
+ }
+
+ @Override
+ public void closeRtpServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback) {
+ zlmServerFactory.closeRtpServer(mediaServerItem, streamId, callback);
+ }
+
+ @Override
+ public void closeStreams(MediaServerItem mediaServerItem, String app, String stream) {
+ zlmresTfulUtils.closeStreams(mediaServerItem, app, stream);
+ }
+
+ @Override
+ public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
+ return zlmServerFactory.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
+ }
+
+ @Override
+ public boolean checkNodeId(MediaServerItem mediaServerItem) {
+ if (mediaServerItem == null) {
+ return false;
+ }
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ if (responseJSON != null) {
+ JSONArray data = responseJSON.getJSONArray("data");
+ if (data != null && !data.isEmpty()) {
+ ZLMServerConfig zlmServerConfig= JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
+ return zlmServerConfig.getGeneralMediaServerId().equals(mediaServerItem.getId());
+ }else {
+ return false;
+ }
+
+ }else {
+ return false;
+ }
+ }
+
+ @Override
+ public void online(MediaServerItem mediaServerItem) {
+
+ }
}
--
Gitblit v1.8.0