From 691313b77861eeaeee2c67002b9cee23fbf1f942 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期三, 16 三月 2022 08:54:31 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java | 58 ++++----
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 14 +-
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 186 ++++++++++++++++++------------
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java | 11 +
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 10 -
src/main/resources/all-application.yml | 2
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 2
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 7
web_src/src/components/dialog/chooseChannelForStream.vue | 2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 8
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java | 1
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 14 +-
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 3
src/main/resources/application-dev.yml | 2
15 files changed, 181 insertions(+), 145 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index 5df6314..d2ef5ed 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -670,6 +670,7 @@
try {
SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, null, stream);
ClientTransaction transaction = streamSession.getTransactionByStream(deviceId, channelId, stream);
+
if (transaction == null) {
logger.warn("[ {} -> {}]鍋滄瑙嗛娴佺殑鏃跺�欏彂鐜颁簨鍔″凡涓㈠け", deviceId, channelId);
SipSubscribe.EventResult<Object> eventResult = new SipSubscribe.EventResult<>();
@@ -685,7 +686,12 @@
if (stream == null) return;
dialog = streamSession.getDialogByStream(deviceId, channelId, stream);
}
-
+ if (ssrcTransaction != null) {
+ MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());
+ mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());
+ streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());
+ }
if (dialog == null) {
logger.warn("[ {} -> {}]鍋滄瑙嗛娴佺殑鏃跺�欏彂鐜板璇濆凡涓㈠け", deviceId, channelId);
@@ -730,12 +736,6 @@
dialog.sendRequest(clientTransaction);
- if (ssrcTransaction != null) {
- MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());
- mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());
- mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());
- streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());
- }
} catch (SipException | ParseException e) {
e.printStackTrace();
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
index fef3412..77b4b32 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -372,12 +372,12 @@
}
}
if (playTransaction == null) {
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, null, true);
+ String streamId = null;
if (mediaServerItem.isRtpEnable()) {
- sendRtpItem.setStreamId(String.format("%s_%s", device.getDeviceId(), channelId));
- }else {
- sendRtpItem.setStreamId(ssrcInfo.getStream());
+ streamId = String.format("%s_%s", device.getDeviceId(), channelId);
}
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, true);
+ sendRtpItem.setStreamId(ssrcInfo.getStream());
// 鍐欏叆redis锛� 瓒呮椂鏃跺洖澶�
redisCatchStorage.updateSendRTPSever(sendRtpItem);
playService.play(mediaServerItem, ssrcInfo, device, channelId, hookEvent, errorEvent, (code, msg)->{
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
index 1cb1128..6c33406 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
@@ -100,7 +100,6 @@
subscribeHolder.removeCatalogSubscribe(platformGBId);
subscribeHolder.removeMobilePositionSubscribe(platformGBId);
}
-
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index a491387..57ba4a5 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -191,7 +191,7 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- ret.put("enableHls", true);
+ ret.put("enable_hls", true);
String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
if (subscribe != null) {
@@ -206,9 +206,9 @@
String app = json.getString("app");
String stream = json.getString("stream");
if ("rtp".equals(app)) {
- ret.put("enableMP4", userSetup.getRecordSip());
+ ret.put("enable_mp4", userSetup.getRecordSip());
}else {
- ret.put("enableMP4", userSetup.isRecordPushLive());
+ ret.put("enable_mp4", userSetup.isRecordPushLive());
}
List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, stream);
if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index 5d1e8af..9f22f82 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -10,8 +10,7 @@
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
@Component
public class ZLMRTPServerFactory {
@@ -23,54 +22,80 @@
private int[] portRangeArray = new int[2];
- public int createRTPServer(MediaServerItem mediaServerItem, String streamId) {
- Map<String, Integer> currentStreams = new HashMap<>();
+ public int getFreePort(MediaServerItem mediaServerItem, int startPort, int endPort, List<Integer> usedFreelist) {
+ if (endPort <= startPort) return -1;
+ if (usedFreelist == null) {
+ usedFreelist = new ArrayList<>();
+ }
JSONObject listRtpServerJsonResult = zlmresTfulUtils.listRtpServer(mediaServerItem);
if (listRtpServerJsonResult != null) {
JSONArray data = listRtpServerJsonResult.getJSONArray("data");
if (data != null) {
for (int i = 0; i < data.size(); i++) {
JSONObject dataItem = data.getJSONObject(i);
- currentStreams.put(dataItem.getString("stream_id"), dataItem.getInteger("port"));
+ usedFreelist.add(dataItem.getInteger("port"));
}
}
- }
- // 宸茬粡鍦ㄦ帹娴�
- if (currentStreams.get(streamId) != null) {
- Map<String, Object> closeRtpServerParam = new HashMap<>();
- closeRtpServerParam.put("stream_id", streamId);
- zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
- currentStreams.remove(streamId);
}
Map<String, Object> param = new HashMap<>();
int result = -1;
- // 涓嶈缃帹娴佺鍙ｇ鍒欎娇鐢ㄩ殢鏈虹鍙�
- if (!StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
- int newPort = getPortFromportRange(mediaServerItem);
- param.put("port", newPort);
+ // 璁剧疆鎺ㄦ祦绔彛
+ if (startPort%2 == 1) {
+ startPort ++;
}
+ boolean checkPort = false;
+ for (int i = startPort; i < endPort + 1; i+=2) {
+ if (!usedFreelist.contains(i)){
+ checkPort = true;
+ startPort = i;
+ break;
+ }
+ }
+ if (!checkPort) {
+ logger.warn("鏈壘鍒拌妭鐐箋}涓婅寖鍥碵{}-{}]鐨勭┖闂茬鍙�", mediaServerItem.getId(), startPort, endPort);
+ return -1;
+ }
+ param.put("port", startPort);
+ String stream = UUID.randomUUID().toString();
param.put("enable_tcp", 1);
- param.put("stream_id", streamId);
+ param.put("stream_id", stream);
+ param.put("port", 0);
JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
if (openRtpServerResultJson != null) {
- switch (openRtpServerResultJson.getInteger("code")){
- case 0:
- result= openRtpServerResultJson.getInteger("port");
- break;
- case -300: // id宸茬粡瀛樺湪, 鍙兘宸茬粡鍦ㄥ叾浠栫鍙ｆ帹娴�
- Map<String, Object> closeRtpServerParam = new HashMap<>();
- closeRtpServerParam.put("stream_id", streamId);
- zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
- result = createRTPServer(mediaServerItem, streamId);;
- break;
- case -400: // 绔彛鍗犵敤
- result= createRTPServer(mediaServerItem, streamId);
- break;
- default:
- logger.error("鍒涘缓RTP Server 澶辫触 {}: " + openRtpServerResultJson.getString("msg"), param.get("port"));
- break;
+ if (openRtpServerResultJson.getInteger("code") == 0) {
+ result= openRtpServerResultJson.getInteger("port");
+ Map<String, Object> closeRtpServerParam = new HashMap<>();
+ closeRtpServerParam.put("stream_id", stream);
+ zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
+ }else {
+ usedFreelist.add(startPort);
+ startPort +=2;
+ result = getFreePort(mediaServerItem, startPort, endPort,usedFreelist);
+ }
+ }else {
+ // 妫�鏌LM鐘舵��
+ logger.error("鍒涘缓RTP Server 澶辫触 {}: 璇锋鏌LM鏈嶅姟", param.get("port"));
+ }
+ return result;
+ }
+
+ public int createRTPServer(MediaServerItem mediaServerItem, String streamId) {
+
+ Map<String, Object> param = new HashMap<>();
+ int result = -1;
+ // 鎺ㄦ祦绔彛璁剧疆0鍒欎娇鐢ㄩ殢鏈虹鍙�
+ param.put("enable_tcp", 1);
+ param.put("stream_id", streamId);
+ param.put("port", 0);
+ JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
+
+ if (openRtpServerResultJson != null) {
+ if (openRtpServerResultJson.getInteger("code") == 0) {
+ result= openRtpServerResultJson.getInteger("port");
+ }else {
+ logger.error("鍒涘缓RTP Server 澶辫触 {}: ", openRtpServerResultJson.getString("msg"));
}
}else {
// 妫�鏌LM鐘舵��
@@ -99,32 +124,32 @@
return result;
}
- private int getPortFromportRange(MediaServerItem mediaServerItem) {
- int currentPort = mediaServerItem.getCurrentPort();
- if (currentPort == 0) {
- String[] portRangeStrArray = mediaServerItem.getSendRtpPortRange().split(",");
- if (portRangeStrArray.length != 2) {
- portRangeArray[0] = 30000;
- portRangeArray[1] = 30500;
- }else {
- portRangeArray[0] = Integer.parseInt(portRangeStrArray[0]);
- portRangeArray[1] = Integer.parseInt(portRangeStrArray[1]);
- }
- }
-
- if (currentPort == 0 || currentPort++ > portRangeArray[1]) {
- currentPort = portRangeArray[0];
- mediaServerItem.setCurrentPort(currentPort);
- return portRangeArray[0];
- } else {
- if (currentPort % 2 == 1) {
- currentPort++;
- }
- currentPort++;
- mediaServerItem.setCurrentPort(currentPort);
- return currentPort;
- }
- }
+// private int getPortFromportRange(MediaServerItem mediaServerItem) {
+// int currentPort = mediaServerItem.getCurrentPort();
+// if (currentPort == 0) {
+// String[] portRangeStrArray = mediaServerItem.getSendRtpPortRange().split(",");
+// if (portRangeStrArray.length != 2) {
+// portRangeArray[0] = 30000;
+// portRangeArray[1] = 30500;
+// }else {
+// portRangeArray[0] = Integer.parseInt(portRangeStrArray[0]);
+// portRangeArray[1] = Integer.parseInt(portRangeStrArray[1]);
+// }
+// }
+//
+// if (currentPort == 0 || currentPort++ > portRangeArray[1]) {
+// currentPort = portRangeArray[0];
+// mediaServerItem.setCurrentPort(currentPort);
+// return portRangeArray[0];
+// } else {
+// if (currentPort % 2 == 1) {
+// currentPort++;
+// }
+// currentPort++;
+// mediaServerItem.setCurrentPort(currentPort);
+// return currentPort;
+// }
+// }
/**
* 鍒涘缓涓�涓浗鏍囨帹娴�
@@ -139,13 +164,18 @@
public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String deviceId, String channelId, boolean tcp){
// 浣跨敤RTPServer 鍔熻兘鎵句竴涓彲鐢ㄧ殑绔彛
- String playSsrc = serverItem.getSsrcConfig().getPlaySsrc();
- int localPort = createRTPServer(serverItem, playSsrc);
- if (localPort != -1) {
- // TODO 楂樺苟鍙戞椂鍙兘鍥犱负鏈斁鍏ョ紦瀛樿�宻src鍐茬獊
- serverItem.getSsrcConfig().releaseSsrc(playSsrc);
- closeRTPServer(serverItem, playSsrc);
+ String sendRtpPortRange = serverItem.getSendRtpPortRange();
+ if (StringUtils.isEmpty(sendRtpPortRange)) {
+ return null;
+ }
+ String[] portRangeStrArray = serverItem.getSendRtpPortRange().split(",");
+ int localPort = -1;
+ if (portRangeStrArray.length != 2) {
+ localPort = getFreePort(serverItem, 30000, 30500, null);
}else {
+ localPort = getFreePort(serverItem, Integer.parseInt(portRangeStrArray[0]), Integer.parseInt(portRangeStrArray[1]), null);
+ }
+ if (localPort == -1) {
logger.error("娌℃湁鍙敤鐨勭鍙�");
return null;
}
@@ -174,13 +204,19 @@
* @return SendRtpItem
*/
public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String app, String stream, String channelId, boolean tcp){
- String playSsrc = serverItem.getSsrcConfig().getPlaySsrc();
- int localPort = createRTPServer(serverItem, playSsrc);
- if (localPort != -1) {
- // TODO 楂樺苟鍙戞椂鍙兘鍥犱负鏈斁鍏ョ紦瀛樿�宻src鍐茬獊
- serverItem.getSsrcConfig().releaseSsrc(ssrc);
- closeRTPServer(serverItem, playSsrc);
+ // 浣跨敤RTPServer 鍔熻兘鎵句竴涓彲鐢ㄧ殑绔彛
+ String sendRtpPortRange = serverItem.getSendRtpPortRange();
+ if (StringUtils.isEmpty(sendRtpPortRange)) {
+ return null;
+ }
+ String[] portRangeStrArray = serverItem.getSendRtpPortRange().split(",");
+ int localPort = -1;
+ if (portRangeStrArray.length != 2) {
+ localPort = getFreePort(serverItem, 30000, 30500, null);
}else {
+ localPort = getFreePort(serverItem, Integer.parseInt(portRangeStrArray[0]), Integer.parseInt(portRangeStrArray[1]), null);
+ }
+ if (localPort == -1) {
logger.error("娌℃湁鍙敤鐨勭鍙�");
return null;
}
@@ -199,7 +235,7 @@
}
/**
- * 璋冪敤zlm RESTful API 鈥斺�� startSendRtp
+ * 璋冪敤zlm RESTFUL API 鈥斺�� startSendRtp
*/
public JSONObject startSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
Boolean result = false;
@@ -208,9 +244,9 @@
logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
result= true;
- logger.info("RTP鎺ㄦ祦[ {}/{} ]璇锋眰鎴愬姛锛屾湰鍦版帹娴佺鍙ｏ細{}" ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"));
+ logger.info("RTP鎺ㄦ祦鎴愬姛[ {}/{} ]锛屾湰鍦版帹娴佺鍙ｏ細{}" ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"));
} else {
- logger.error("RTP鎺ㄦ祦澶辫触: " + jsonObject.getString("msg"));
+ logger.error("RTP鎺ㄦ祦澶辫触: {}, 鍙傛暟锛歿}",jsonObject.getString("msg"),JSONObject.toJSON(param));
}
return jsonObject;
}
@@ -265,7 +301,7 @@
result= true;
logger.info("鍋滄RTP鎺ㄦ祦鎴愬姛");
} else {
- logger.error("鍋滄RTP鎺ㄦ祦澶辫触: " + jsonObject.getString("msg"));
+ logger.error("RTP鎺ㄦ祦澶辫触: {}, 鍙傛暟锛歿}",jsonObject.getString("msg"),JSONObject.toJSON(param));
}
return result;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
index 7e3da46..db4ab76 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
@@ -194,6 +194,9 @@
@JSONField(name = "rtp_proxy.port")
private int rtpProxyPort;
+ @JSONField(name = "rtp_proxy.port_range")
+ private String portRange;
+
@JSONField(name = "rtp_proxy.timeoutSec")
private String rtpProxyTimeoutSec;
@@ -802,4 +805,12 @@
public void setHookAliveInterval(int hookAliveInterval) {
this.hookAliveInterval = hookAliveInterval;
}
+
+ public String getPortRange() {
+ return portRange;
+ }
+
+ public void setPortRange(String portRange) {
+ this.portRange = portRange;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
index 260da27..181fc5b 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
@@ -91,7 +91,7 @@
streamNoneReaderDelayMS = zlmServerConfig.getGeneralStreamNoneReaderDelayMS();
hookAliveInterval = zlmServerConfig.getHookAliveInterval();
rtpEnable = false; // 榛樿浣跨敤鍗曠鍙�;鐩村埌鐢ㄦ埛鑷繁璁剧疆寮�鍚绔彛
- rtpPortRange = "30000,30500"; // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
+ rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
sendRtpPortRange = "30000,30500"; // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
recordAssistPort = 0; // 榛樿鍏抽棴
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index d369587..43312a8 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -521,6 +521,9 @@
// 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
// 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
param.put("general.wait_track_ready_ms", "3000" );
+ if (mediaServerItem.isRtpEnable() && !StringUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
+ param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
+ }
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
index e59a090..aab2282 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
@@ -411,38 +411,38 @@
// 閬嶅巻瀛樺偍缁撴灉锛屾煡鎵綼pp+Stream->platformId+catalogId鐨勫搴斿叧绯伙紝鐒跺悗鎵ц鎵归噺鍐欏叆
for (StreamPushItem streamPushItem : streamPushItemsForPlatform) {
List<String[]> platFormInfoList = streamPushItemsForAll.get(streamPushItem.getApp() + streamPushItem.getStream());
- if (platFormInfoList != null) {
- if (platFormInfoList.size() > 0) {
- for (String[] platFormInfoArray : platFormInfoList) {
- StreamPushItem streamPushItemForPlatform = new StreamPushItem();
- streamPushItemForPlatform.setGbStreamId(streamPushItem.getGbStreamId());
- if (platFormInfoArray.length > 0) {
- // 鏁扮粍 platFormInfoArray 0 涓哄钩鍙癐D銆� 1涓虹洰褰旾D
- // 涓嶅瓨鍦ㄨ繖涓钩鍙帮紝鍒欏拷鐣ュ鍏ユ鍏宠仈鍏崇郴
- if (platformInfoMap.get(platFormInfoArray[0]) == null
- || platformInfoMap.get(platFormInfoArray[0]).get(platFormInfoArray[1]) == null) {
- logger.info("瀵煎叆鏁版嵁鏃朵笉瀛樺湪骞冲彴鎴栫洰褰晎}/{},宸插鍏ユ湭鍒嗛厤", platFormInfoArray[0], platFormInfoArray[1] );
- continue;
- }
- streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]);
-
- List<GbStream> gbStreamList = platformForEvent.get(streamPushItem.getPlatformId());
- if (gbStreamList == null) {
- gbStreamList = new ArrayList<>();
- platformForEvent.put(platFormInfoArray[0], gbStreamList);
- }
- // 涓哄彂閫侀�氱煡鏁寸悊鏁版嵁
- streamPushItemForPlatform.setName(streamPushItem.getName());
- streamPushItemForPlatform.setApp(streamPushItem.getApp());
- streamPushItemForPlatform.setStream(streamPushItem.getStream());
- streamPushItemForPlatform.setGbId(streamPushItem.getGbId());
- gbStreamList.add(streamPushItemForPlatform);
+ if (platFormInfoList != null && platFormInfoList.size() > 0) {
+ for (String[] platFormInfoArray : platFormInfoList) {
+ StreamPushItem streamPushItemForPlatform = new StreamPushItem();
+ streamPushItemForPlatform.setGbStreamId(streamPushItem.getGbStreamId());
+ if (platFormInfoArray.length > 0) {
+ // 鏁扮粍 platFormInfoArray 0 涓哄钩鍙癐D銆� 1涓虹洰褰旾D
+ // 涓嶅瓨鍦ㄨ繖涓钩鍙帮紝鍒欏拷鐣ュ鍏ユ鍏宠仈鍏崇郴
+ if (platformInfoMap.get(platFormInfoArray[0]) == null
+ || platformInfoMap.get(platFormInfoArray[0]).get(platFormInfoArray[1]) == null) {
+ logger.info("瀵煎叆鏁版嵁鏃朵笉瀛樺湪骞冲彴鎴栫洰褰晎}/{},宸插鍏ユ湭鍒嗛厤", platFormInfoArray[0], platFormInfoArray[1] );
+ continue;
}
- if (platFormInfoArray.length > 1) {
- streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]);
+ streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]);
+ if (platFormInfoArray[0].equals("34020000002110000001")) {
+ System.out.println(111);
}
- streamPushItemListFroPlatform.add(streamPushItemForPlatform);
+ List<GbStream> gbStreamList = platformForEvent.get(platFormInfoArray[0]);
+ if (gbStreamList == null) {
+ gbStreamList = new ArrayList<>();
+ platformForEvent.put(platFormInfoArray[0], gbStreamList);
+ }
+ // 涓哄彂閫侀�氱煡鏁寸悊鏁版嵁
+ streamPushItemForPlatform.setName(streamPushItem.getName());
+ streamPushItemForPlatform.setApp(streamPushItem.getApp());
+ streamPushItemForPlatform.setStream(streamPushItem.getStream());
+ streamPushItemForPlatform.setGbId(streamPushItem.getGbId());
+ gbStreamList.add(streamPushItemForPlatform);
}
+ if (platFormInfoArray.length > 1) {
+ streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]);
+ }
+ streamPushItemListFroPlatform.add(streamPushItemForPlatform);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index bb265a5..feabbf1 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -885,12 +885,11 @@
List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
if (parentPlatforms.size() > 0) {
for (ParentPlatform parentPlatform : parentPlatforms) {
- streamPushItem.setCatalogId(parentPlatform.getCatalogId());
- streamPushItem.setPlatformId(parentPlatform.getServerGBId());
- String stream = streamPushItem.getStream();
- StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(streamPushItem.getApp(), stream,
+ StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(streamPushItem.getApp(), streamPushItem.getStream(),
parentPlatform.getServerGBId());
if (streamProxyItems == null) {
+ streamPushItem.setCatalogId(parentPlatform.getCatalogId());
+ streamPushItem.setPlatformId(parentPlatform.getServerGBId());
platformGbStreamMapper.add(streamPushItem);
eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), streamPushItem, CatalogEvent.ADD);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 16e8eec..930bb33 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -109,7 +109,6 @@
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
resultHolder.put(key, uuid, result);
- Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo == null) {
RequestMessage msg = new RequestMessage();
@@ -120,15 +119,14 @@
storager.stopPlay(deviceId, channelId);
return result;
}
- cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, (event) -> {
+ cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, eventResult -> {
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- //Response response = event.getResponse();
- msg.setData(String.format("success"));
- resultHolder.invokeAllResult(msg);
+ RequestMessage msgForSuccess = new RequestMessage();
+ msgForSuccess.setId(uuid);
+ msgForSuccess.setKey(key);
+ msgForSuccess.setData(String.format("success"));
+ resultHolder.invokeAllResult(msgForSuccess);
});
if (deviceId != null || channelId != null) {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
index 36545b3..cf0fed8 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -168,16 +168,6 @@
result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
return result;
}
-// if (!file.getContentType().endsWith(".xls")
-// && !file.getContentType().endsWith(".csv")
-// && !file.getContentType().endsWith(".xlsx") ) {
-// logger.warn("閫氶亾瀵煎叆鏂囦欢绫诲瀷閿欒: {}",file.getContentType() );
-// WVPResult<Object> wvpResult = new WVPResult<>();
-// wvpResult.setCode(-1);
-// wvpResult.setMsg("鏂囦欢绫诲瀷閿欒锛岃浣跨敤");
-// result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
-// return result;
-// }
// 鍚屾椂鍙鐞嗕竴涓枃浠�
if (resultHolder.exist(key, null)) {
logger.warn("宸叉湁瀵煎叆浠诲姟姝ｅ湪鎵ц");
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index e90f5a1..f7f8604 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -147,7 +147,7 @@
rtp:
# [鍙�塢 鏄惁鍚敤澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
enable: true
- # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�,
+ # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛
port-range: 30000,30500 # 绔彛鑼冨洿
# [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
send-port-range: 30000,30500 # 绔彛鑼冨洿
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fe7253d..b1950c5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -76,7 +76,7 @@
rtp:
# [鍙�塢 鏄惁鍚敤澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
enable: true
- # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�,
+ # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛
port-range: 30000,30500 # 绔彛鑼冨洿
# [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
send-port-range: 30000,30500 # 绔彛鑼冨洿
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index eeee14e..d5e5ac3 100644
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -174,7 +174,7 @@
page: that.currentPage,
count: that.count,
query: that.searchSrt,
- pushing: that.online,
+ pushing: that.pushing,
platformId: that.platformId,
catalogId: that.catalogId,
mediaServerId: that.mediaServerId
--
Gitblit v1.8.0