Browse Source

添加拉流代理与国标关联, 支持代理rtsp/rtmp/...,转发到国标

pull/80/head
panlinlin 4 years ago
parent
commit
7dc8fd4a1e
  1. 9
      src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
  2. 71
      src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
  3. 31
      src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java
  4. 9
      src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
  5. 4
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  6. 30
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  7. 17
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
  8. 4
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java
  9. 183
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/InviteRequestProcessor.java
  10. 33
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
  11. 47
      src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
  12. 6
      src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
  13. 7
      src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
  14. 34
      src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
  15. 49
      src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
  16. 28
      src/main/java/com/genersoft/iot/vmp/storager/dao/PlarfotmGbStreamMapper.java
  17. 2
      src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
  18. 18
      src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java
  19. 102
      src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
  20. 65
      src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/GbStreamController.java
  21. 28
      src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/bean/GbStreamParam.java
  22. 3
      src/main/java/com/genersoft/iot/vmp/vmanager/media/MediaController.java
  23. 35
      src/main/java/com/genersoft/iot/vmp/vmanager/platformGbStream/PlatformGbStreamController.java
  24. 13
      src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
  25. 41
      src/main/java/com/genersoft/iot/vmp/vmanager/service/IGbStreamService.java
  26. 11
      src/main/java/com/genersoft/iot/vmp/vmanager/service/IStreamProxyService.java
  27. 89
      src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/GbStreamServiceImpl.java
  28. 2
      src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/MediaServiceImpl.java
  29. 19
      src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
  30. 56
      src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/StreamProxyServiceImpl.java
  31. 13
      src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
  32. BIN
      src/main/resources/wvp.sqlite
  33. 283
      web_src/src/components/PLatformStreamList.vue
  34. 2
      web_src/src/components/ParentPlatformList.vue
  35. 21
      web_src/src/components/PushVideoList.vue
  36. 7
      web_src/src/components/StreamProxyList.vue
  37. 11
      web_src/src/components/dialog/StreamProxyEdit.vue
  38. 8
      web_src/src/components/dialog/chooseChannel.vue
  39. 2
      web_src/src/components/dialog/chooseChannelForGb.vue
  40. 215
      web_src/src/components/dialog/chooseChannelForStream.vue
  41. 7
      web_src/src/components/dialog/devicePlayer.vue
  42. 5
      web_src/src/router/index.js

9
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
public class StreamInfo { public class StreamInfo {
private String app;
private String streamId; private String streamId;
private String deviceID; private String deviceID;
private String channelId; private String channelId;
@ -19,6 +20,14 @@ public class StreamInfo {
private String rtsp; private String rtsp;
private JSONArray tracks; private JSONArray tracks;
public String getApp() {
return app;
}
public void setApp(String app) {
this.app = app;
}
public String getDeviceID() { public String getDeviceID() {
return deviceID; return deviceID;
} }

71
src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java

@ -0,0 +1,71 @@
package com.genersoft.iot.vmp.gb28181.bean;
/**
* 直播流关联国标上级平台
*/
public class GbStream extends PlatformGbStream{
private String app;
private String stream;
private String gbId;
private String name;
private double longitude;
private double latitude;
private String streamType;
public String getApp() {
return app;
}
public void setApp(String app) {
this.app = app;
}
public String getStream() {
return stream;
}
public void setStream(String stream) {
this.stream = stream;
}
public String getGbId() {
return gbId;
}
public void setGbId(String gbId) {
this.gbId = gbId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public double getLongitude() {
return longitude;
}
public void setLongitude(double longitude) {
this.longitude = longitude;
}
public double getLatitude() {
return latitude;
}
public void setLatitude(double latitude) {
this.latitude = latitude;
}
public String getStreamType() {
return streamType;
}
public void setStreamType(String streamType) {
this.streamType = streamType;
}
}

31
src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java

@ -0,0 +1,31 @@
package com.genersoft.iot.vmp.gb28181.bean;
public class PlatformGbStream {
private String app;
private String stream;
private String platformId;
public String getApp() {
return app;
}
public void setApp(String app) {
this.app = app;
}
public String getStream() {
return stream;
}
public void setStream(String stream) {
this.stream = stream;
}
public String getPlatformId() {
return platformId;
}
public void setPlatformId(String platformId) {
this.platformId = platformId;
}
}

9
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java

@ -27,6 +27,11 @@ public class SendRtpItem {
*/ */
private String deviceId; private String deviceId;
/**
* 直播流的应用名
*/
private String app;
/** /**
* 通道id * 通道id
*/ */
@ -40,10 +45,6 @@ public class SendRtpItem {
*/ */
private int status = 0; private int status = 0;
/**
* 设备推流的app
*/
private String app = "rtp";
/** /**
* 设备推流的streamId * 设备推流的streamId

4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@ -91,7 +91,9 @@ public class SIPCommander implements ISIPCommander {
@Autowired @Autowired
private SipSubscribe sipSubscribe; private SipSubscribe sipSubscribe;
public SipConfig getSipConfig() {
return sipConfig;
}
/** /**
* 云台方向放控制使用配置文件中的默认镜头移动速度 * 云台方向放控制使用配置文件中的默认镜头移动速度

30
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java

@ -197,7 +197,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
@Override @Override
public boolean catalogQuery(DeviceChannel channel, ParentPlatform parentPlatform, String sn, String fromTag, int size) { public boolean catalogQuery(DeviceChannel channel, ParentPlatform parentPlatform, String sn, String fromTag, int size) {
if (channel == null || parentPlatform ==null) { if ( parentPlatform ==null) {
return false; return false;
} }
try { try {
@ -210,20 +210,22 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
catalogXml.append("<SumNum>" + size + "</SumNum>\r\n"); catalogXml.append("<SumNum>" + size + "</SumNum>\r\n");
catalogXml.append("<DeviceList Num=\"1\">\r\n"); catalogXml.append("<DeviceList Num=\"1\">\r\n");
catalogXml.append("<Item>\r\n"); catalogXml.append("<Item>\r\n");
if (channel != null) {
catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
catalogXml.append("<Name>" + channel.getName() + "</Name>\r\n");
catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
catalogXml.append("<Owner>" + channel.getOwner() + "</Owner>\r\n");
catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");// TODO 当前不能添加分组, 所以暂时没有父节点
catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); // TODO 当前不能添加分组, 所以暂时没有父节点
catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
catalogXml.append("<Status>" + (channel.getStatus() == 0?"OFF":"ON") + "</Status>\r\n");
catalogXml.append("<Info></Info>\r\n");
}
catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
catalogXml.append("<Name>" + channel.getName() + "</Name>\r\n");
catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
catalogXml.append("<Owner>" + channel.getOwner() + "</Owner>\r\n");
catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");// TODO 当前不能添加分组, 所以暂时没有父节点
catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); // TODO 当前不能添加分组, 所以暂时没有父节点
catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
catalogXml.append("<Status>" + (channel.getStatus() == 0?"OFF":"ON") + "</Status>\r\n");
catalogXml.append("<Info></Info>\r\n");
catalogXml.append("</Item>\r\n"); catalogXml.append("</Item>\r\n");
catalogXml.append("</DeviceList>\r\n"); catalogXml.append("</DeviceList>\r\n");

17
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java

@ -43,14 +43,23 @@ public class AckRequestProcessor extends SIPRequestAbstractProcessor {
SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId); SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId);
String is_Udp = sendRtpItem.isTcp() ? "0" : "1"; String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
String deviceId = sendRtpItem.getDeviceId(); String deviceId = sendRtpItem.getDeviceId();
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId); StreamInfo streamInfo = null;
sendRtpItem.setStreamId(streamInfo.getStreamId()); if (deviceId == null) {
streamInfo = new StreamInfo();
streamInfo.setApp(sendRtpItem.getApp());
streamInfo.setStreamId(sendRtpItem.getStreamId());
}else {
streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
sendRtpItem.setStreamId(streamInfo.getStreamId());
streamInfo.setApp("rtp");
}
redisCatchStorage.updateSendRTPSever(sendRtpItem); redisCatchStorage.updateSendRTPSever(sendRtpItem);
System.out.println(platformGbId); System.out.println(platformGbId);
System.out.println(channelId); System.out.println(channelId);
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("vhost","__defaultVhost__"); param.put("vhost","__defaultVhost__");
param.put("app","rtp"); param.put("app",streamInfo.getApp());
param.put("stream",streamInfo.getStreamId()); param.put("stream",streamInfo.getStreamId());
param.put("ssrc", sendRtpItem.getSsrc()); param.put("ssrc", sendRtpItem.getSsrc());
param.put("dst_url",sendRtpItem.getIp()); param.put("dst_url",sendRtpItem.getIp());
@ -63,7 +72,7 @@ public class AckRequestProcessor extends SIPRequestAbstractProcessor {
while (!rtpPushed) { while (!rtpPushed) {
try { try {
if (System.currentTimeMillis() - startTime < 30 * 1000) { if (System.currentTimeMillis() - startTime < 30 * 1000) {
if (zlmrtpServerFactory.isRtpReady(streamInfo.getStreamId())) { if (zlmrtpServerFactory.isStreamReady(streamInfo.getApp(), streamInfo.getStreamId())) {
rtpPushed = true; rtpPushed = true;
System.out.println("已获取设备推流,开始向上级推流"); System.out.println("已获取设备推流,开始向上级推流");
zlmrtpServerFactory.startSendRtpStream(param); zlmrtpServerFactory.startSendRtpStream(param);

4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java

@ -51,12 +51,12 @@ public class ByeRequestProcessor extends SIPRequestAbstractProcessor {
String streamId = sendRtpItem.getStreamId(); String streamId = sendRtpItem.getStreamId();
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("vhost","__defaultVhost__"); param.put("vhost","__defaultVhost__");
param.put("app","rtp"); param.put("app",sendRtpItem.getApp());
param.put("stream",streamId); param.put("stream",streamId);
System.out.println("停止向上级推流:" + streamId); System.out.println("停止向上级推流:" + streamId);
zlmrtpServerFactory.stopSendRtpStream(param); zlmrtpServerFactory.stopSendRtpStream(param);
redisCatchStorage.deleteSendRTPServer(platformGbId, channelId); redisCatchStorage.deleteSendRTPServer(platformGbId, channelId);
if (zlmrtpServerFactory.totalReaderCount(streamId) == 0) { if (zlmrtpServerFactory.totalReaderCount(sendRtpItem.getApp(), streamId) == 0) {
System.out.println(streamId + "无其它观看者,通知设备停止推流"); System.out.println(streamId + "无其它观看者,通知设备停止推流");
cmder.streamByeCmd(streamId); cmder.streamByeCmd(streamId);
} }

183
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/InviteRequestProcessor.java

@ -12,13 +12,12 @@ import javax.sip.message.Request;
import javax.sip.message.Response; import javax.sip.message.Response;
import com.genersoft.iot.vmp.conf.MediaServerConfig; import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform; import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor; import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
@ -30,6 +29,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.text.ParseException; import java.text.ParseException;
import java.util.HashMap;
import java.util.Map;
import java.util.Vector; import java.util.Vector;
/** /**
@ -93,12 +94,14 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
if (platform != null) { if (platform != null) {
// 查询平台下是否有该通道 // 查询平台下是否有该通道
DeviceChannel channel = storager.queryChannelInParentPlatform(requesterId, channelId); DeviceChannel channel = storager.queryChannelInParentPlatform(requesterId, channelId);
if (channel == null) { GbStream gbStream = storager.queryStreamInParentPlatform(requesterId, channelId);
// 不是通道可能是直播流
if (channel != null || gbStream != null ) {
responseAck(evt, Response.CALL_IS_BEING_FORWARDED); // 通道存在,发181,呼叫转接中
}else {
logger.info("通道不存在,返回404"); logger.info("通道不存在,返回404");
responseAck(evt, Response.NOT_FOUND); // 通道不存在,发404,资源不存在 responseAck(evt, Response.NOT_FOUND); // 通道不存在,发404,资源不存在
return; return;
}else {
responseAck(evt, Response.CALL_IS_BEING_FORWARDED); // 通道存在,发181,呼叫转接中
} }
// 解析sdp消息, 使用jainsip 自带的sdp解析方式 // 解析sdp消息, 使用jainsip 自带的sdp解析方式
String contentString = new String(request.getRawContent()); String contentString = new String(request.getRawContent());
@ -153,67 +156,120 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
String addressStr = sdp.getOrigin().getAddress(); String addressStr = sdp.getOrigin().getAddress();
//String sessionName = sdp.getSessionName().getValue(); //String sessionName = sdp.getSessionName().getValue();
logger.info("[上级点播]用户:{}, 地址:{}:{}, ssrc:{}", username, addressStr, port, ssrc); logger.info("[上级点播]用户:{}, 地址:{}:{}, ssrc:{}", username, addressStr, port, ssrc);
Device device = null;
// 通过 channel 和 gbStream 是否为null 值判断来源是直播流合适国标
if (channel != null) {
device = storager.queryVideoDeviceByPlatformIdAndChannelId(requesterId, channelId);
if (device == null) {
logger.warn("点播平台{}的通道{}时未找到设备信息", requesterId, channel);
responseAck(evt, Response.SERVER_INTERNAL_ERROR);
return;
}
SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(addressStr, port, ssrc, requesterId,
device.getDeviceId(), channelId,
mediaTransmissionTCP);
if (tcpActive != null) {
sendRtpItem.setTcpActive(tcpActive);
}
if (sendRtpItem == null) {
logger.warn("服务器端口资源不足");
responseAck(evt, Response.BUSY_HERE);
return;
}
Device device = storager.queryVideoDeviceByPlatformIdAndChannelId(requesterId, channelId); // 写入redis, 超时时回复
if (device == null) {
logger.warn("点播平台{}的通道{}时未找到设备信息", requesterId, channel);
responseAck(evt, Response.SERVER_INTERNAL_ERROR);
return;
}
SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(addressStr, port, ssrc, requesterId, device.getDeviceId(), channelId,
mediaTransmissionTCP);
if (tcpActive != null) {
sendRtpItem.setTcpActive(tcpActive);
}
if (sendRtpItem == null) {
logger.warn("服务器端口资源不足");
responseAck(evt, Response.BUSY_HERE);
return;
}
// 写入redis, 超时时回复
redisCatchStorage.updateSendRTPSever(sendRtpItem);
// 通知下级推流,
PlayResult playResult = playService.play(device.getDeviceId(), channelId, (responseJSON)->{
// 收到推流, 回复200OK, 等待ack
sendRtpItem.setStatus(1);
redisCatchStorage.updateSendRTPSever(sendRtpItem); redisCatchStorage.updateSendRTPSever(sendRtpItem);
// TODO 添加对tcp的支持 // 通知下级推流,
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); PlayResult playResult = playService.play(device.getDeviceId(), channelId, (responseJSON)->{
StringBuffer content = new StringBuffer(200); // 收到推流, 回复200OK, 等待ack
content.append("v=0\r\n"); if (sendRtpItem == null) return;
content.append("o="+"00000"+" 0 0 IN IP4 "+mediaInfo.getWanIp()+"\r\n"); sendRtpItem.setStatus(1);
content.append("s=Play\r\n"); redisCatchStorage.updateSendRTPSever(sendRtpItem);
content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n"); // TODO 添加对tcp的支持
content.append("t=0 0\r\n"); MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
content.append("m=video "+ sendRtpItem.getLocalPort()+" RTP/AVP 96\r\n"); StringBuffer content = new StringBuffer(200);
content.append("a=sendonly\r\n"); content.append("v=0\r\n");
content.append("a=rtpmap:96 PS/90000\r\n"); content.append("o="+"00000"+" 0 0 IN IP4 "+mediaInfo.getWanIp()+"\r\n");
content.append("y="+ ssrc + "\r\n"); content.append("s=Play\r\n");
content.append("f=\r\n"); content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n");
content.append("t=0 0\r\n");
try { content.append("m=video "+ sendRtpItem.getLocalPort()+" RTP/AVP 96\r\n");
responseAck(evt, content.toString()); content.append("a=sendonly\r\n");
} catch (SipException e) { content.append("a=rtpmap:96 PS/90000\r\n");
e.printStackTrace(); content.append("y="+ ssrc + "\r\n");
} catch (InvalidArgumentException e) { content.append("f=\r\n");
e.printStackTrace();
} catch (ParseException e) { try {
e.printStackTrace(); responseAck(evt, content.toString());
} catch (SipException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
e.printStackTrace();
} catch (ParseException e) {
e.printStackTrace();
}
} ,(event -> {
// 未知错误。直接转发设备点播的错误
Response response = null;
try {
response = getMessageFactory().createResponse(event.getResponse().getStatusCode(), evt.getRequest());
getServerTransaction(evt).sendResponse(response);
} catch (ParseException | SipException | InvalidArgumentException e) {
e.printStackTrace();
}
}));
if (logger.isDebugEnabled()) {
logger.debug(playResult.getResult().toString());
}
}else if (gbStream != null) {
SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(addressStr, port, ssrc, requesterId,
gbStream.getApp(), gbStream.getStream(), channelId,
mediaTransmissionTCP);
if (tcpActive != null) {
sendRtpItem.setTcpActive(tcpActive);
}
if (sendRtpItem == null) {
logger.warn("服务器端口资源不足");
responseAck(evt, Response.BUSY_HERE);
return;
} }
},(event -> {
// 未知错误。直接转发设备点播的错误 // 写入redis, 超时时回复
Response response = null; redisCatchStorage.updateSendRTPSever(sendRtpItem);
try {
response = getMessageFactory().createResponse(event.getResponse().getStatusCode(), evt.getRequest()); // 检测直播流是否在线
getServerTransaction(evt).sendResponse(response); Boolean streamReady = zlmrtpServerFactory.isStreamReady(gbStream.getApp(), gbStream.getStream());
} catch (ParseException | SipException | InvalidArgumentException e) { if (streamReady) {
e.printStackTrace(); sendRtpItem.setStatus(1);
redisCatchStorage.updateSendRTPSever(sendRtpItem);
// TODO 添加对tcp的支持
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n");
content.append("o="+"00000"+" 0 0 IN IP4 "+mediaInfo.getWanIp()+"\r\n");
content.append("s=Play\r\n");
content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n");
content.append("t=0 0\r\n");
content.append("m=video "+ sendRtpItem.getLocalPort()+" RTP/AVP 96\r\n");
content.append("a=sendonly\r\n");
content.append("a=rtpmap:96 PS/90000\r\n");
content.append("y="+ ssrc + "\r\n");
content.append("f=\r\n");
try {
responseAck(evt, content.toString());
} catch (SipException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
e.printStackTrace();
} catch (ParseException e) {
e.printStackTrace();
}
} }
}));
if (logger.isDebugEnabled()) {
logger.debug(playResult.getResult().toString());
} }
} else { } else {
// 非上级平台请求,查询是否设备请求(通常为接收语音广播的设备) // 非上级平台请求,查询是否设备请求(通常为接收语音广播的设备)
Device device = storager.queryVideoDevice(requesterId); Device device = storager.queryVideoDevice(requesterId);
@ -298,6 +354,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
} }
} }
/*** /***
* 回复状态码 * 回复状态码
* 100 trying * 100 trying

33
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@ -529,13 +529,44 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
String sn = snElement.getText(); String sn = snElement.getText();
// 准备回复通道信息 // 准备回复通道信息
List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId()); List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
// 查询关联的直播通道
List<GbStream> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
int size = channelReduces.size() + gbStreams.size();
// 回复级联的通道
if (channelReduces.size() > 0) { if (channelReduces.size() > 0) {
for (ChannelReduce channelReduce : channelReduces) { for (ChannelReduce channelReduce : channelReduces) {
DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId()); DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), channelReduces.size()); cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
} }
} }
// 回复直播的通道
if (gbStreams.size() > 0) {
for (GbStream gbStream : gbStreams) {
DeviceChannel deviceChannel = new DeviceChannel();
deviceChannel.setChannelId(gbStream.getGbId());
deviceChannel.setName(gbStream.getName());
deviceChannel.setLongitude(gbStream.getLongitude());
deviceChannel.setLatitude(gbStream.getLatitude());
deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro");
deviceChannel.setStatus(1);
// deviceChannel.setParentId(parentPlatform.getDeviceGBId());
deviceChannel.setRegisterWay(1);
deviceChannel.setCivilCode(cmder.getSipConfig().getSipDomain());
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
// deviceChannel.setAddress("test");
deviceChannel.setParental(0);
deviceChannel.setSecrecy("0");
deviceChannel.setSecrecy("0");
cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
}
}
if (size == 0) {
// 回复无通道
cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), size);
}
} }

47
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java

@ -96,7 +96,7 @@ public class ZLMRTPServerFactory {
} }
/** /**
* 创建一个推流 * 创建一个国标推流
* @param ip 推流ip * @param ip 推流ip
* @param port 推流端口 * @param port 推流端口
* @param ssrc 推流唯一标识 * @param ssrc 推流唯一标识
@ -122,6 +122,39 @@ public class ZLMRTPServerFactory {
sendRtpItem.setDeviceId(deviceId); sendRtpItem.setDeviceId(deviceId);
sendRtpItem.setChannelId(channelId); sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp); sendRtpItem.setTcp(tcp);
sendRtpItem.setApp("rtp");
sendRtpItem.setLocalPort(localPort);
return sendRtpItem;
}
/**
* 创建一个直播推流
* @param ip 推流ip
* @param port 推流端口
* @param ssrc 推流唯一标识
* @param platformId 平台id
* @param channelId 通道id
* @param tcp 是否为tcp
* @return SendRtpItem
*/
public SendRtpItem createSendRtpItem(String ip, int port, String ssrc, String platformId, String app, String stream, String channelId, boolean tcp){
String playSsrc = SsrcUtil.getPlaySsrc();
int localPort = createRTPServer(SsrcUtil.getPlaySsrc());
if (localPort != -1) {
closeRTPServer(playSsrc);
}else {
logger.error("没有可用的端口");
return null;
}
SendRtpItem sendRtpItem = new SendRtpItem();
sendRtpItem.setIp(ip);
sendRtpItem.setPort(port);
sendRtpItem.setSsrc(ssrc);
sendRtpItem.setApp(app);
sendRtpItem.setStreamId(stream);
sendRtpItem.setPlatformId(platformId);
sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp);
sendRtpItem.setLocalPort(localPort); sendRtpItem.setLocalPort(localPort);
return sendRtpItem; return sendRtpItem;
} }
@ -152,13 +185,21 @@ public class ZLMRTPServerFactory {
return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")); return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
} }
/**
* 查询待转推的流是否就绪
*/
public Boolean isStreamReady(String app, String streamId) {
JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(app, "rtmp", streamId);
return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
}
/** /**
* 查询转推的流是否有其它观看者 * 查询转推的流是否有其它观看者
* @param streamId * @param streamId
* @return * @return
*/ */
public int totalReaderCount(String streamId) { public int totalReaderCount(String app, String streamId) {
JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId); JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(app, "rtmp", streamId);
return mediaInfo.getInteger("totalReaderCount"); return mediaInfo.getInteger("totalReaderCount");
} }

6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java

@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.MediaServerConfig; import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
//import com.genersoft.iot.vmp.storager.IVideoManagerStorager; //import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
@ -165,8 +165,8 @@ public class ZLMRunner implements CommandLineRunner {
// 更新流列表 // 更新流列表
zlmMediaListManager.updateMediaList(); zlmMediaListManager.updateMediaList();
// 恢复流代理 // 恢复流代理
List<StreamProxyDto> streamProxyListForEnable = storager.getStreamProxyListForEnable(true); List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnable(true);
for (StreamProxyDto streamProxyDto : streamProxyListForEnable) { for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
logger.info("恢复流代理," + streamProxyDto.getApp() + "/" + streamProxyDto.getStream()); logger.info("恢复流代理," + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
streamProxyService.addStreamProxyToZlm(streamProxyDto); streamProxyService.addStreamProxyToZlm(streamProxyDto);
} }

7
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyDto.java → src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java

@ -1,6 +1,9 @@
package com.genersoft.iot.vmp.media.zlm.dto; package com.genersoft.iot.vmp.media.zlm.dto;
public class StreamProxyDto { import com.genersoft.iot.vmp.gb28181.bean.GbStream;
public class StreamProxyItem extends GbStream {
private String type; private String type;
private String app; private String app;
private String stream; private String stream;
@ -109,4 +112,6 @@ public class StreamProxyDto {
public void setEnable_mp4(boolean enable_mp4) { public void setEnable_mp4(boolean enable_mp4) {
this.enable_mp4 = enable_mp4; this.enable_mp4 = enable_mp4;
} }
} }

34
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java

@ -2,12 +2,9 @@ package com.genersoft.iot.vmp.storager;
import java.util.List; import java.util.List;
import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce; import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
/** /**
@ -238,7 +235,7 @@ public interface IVideoManagerStorager {
/** /**
* 添加Mobile Position设备移动位置 * 添加Mobile Position设备移动位置
* @param MobilePosition * @param mobilePosition
* @return * @return
*/ */
public boolean insertMobilePosition(MobilePosition mobilePosition); public boolean insertMobilePosition(MobilePosition mobilePosition);
@ -268,14 +265,14 @@ public interface IVideoManagerStorager {
* @param streamProxyDto * @param streamProxyDto
* @return * @return
*/ */
public int addStreamProxy(StreamProxyDto streamProxyDto); public boolean addStreamProxy(StreamProxyItem streamProxyDto);
/** /**
* 更新代理流 * 更新代理流
* @param streamProxyDto * @param streamProxyDto
* @return * @return
*/ */
public int updateStreamProxy(StreamProxyDto streamProxyDto); public boolean updateStreamProxy(StreamProxyItem streamProxyDto);
/** /**
* 移除代理流 * 移除代理流
@ -290,7 +287,7 @@ public interface IVideoManagerStorager {
* @param enable * @param enable
* @return * @return
*/ */
public List<StreamProxyDto> getStreamProxyListForEnable(boolean enable); public List<StreamProxyItem> getStreamProxyListForEnable(boolean enable);
/** /**
* 按照是app和stream获取代理流 * 按照是app和stream获取代理流
@ -298,7 +295,7 @@ public interface IVideoManagerStorager {
* @param stream * @param stream
* @return * @return
*/ */
public StreamProxyDto queryStreamProxy(String app, String stream); public StreamProxyItem queryStreamProxy(String app, String stream);
/** /**
* 获取代理流 * 获取代理流
@ -306,5 +303,20 @@ public interface IVideoManagerStorager {
* @param count * @param count
* @return * @return
*/ */
PageInfo<StreamProxyDto> queryStreamProxyList(Integer page, Integer count); PageInfo<StreamProxyItem> queryStreamProxyList(Integer page, Integer count);
/**
* 根据国标ID获取平台关联的直播流
* @param platformId
* @param channelId
* @return
*/
GbStream queryStreamInParentPlatform(String platformId, String channelId);
/**
* 获取平台关联的直播流
* @param platformId
* @return
*/
List<GbStream> queryGbStreamListInPlatform(String platformId);
} }

49
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java

@ -0,0 +1,49 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface GbStreamMapper {
@Insert("INSERT INTO gb_stream (app, stream, gbId, name, " +
"longitude, latitude, streamType) VALUES" +
"('${app}', '${stream}', '${gbId}', '${name}', " +
"'${longitude}', '${latitude}', '${streamType}')")
int add(GbStream gbStream);
@Update("UPDATE gb_stream " +
"SET app=#{app}," +
"stream=#{stream}," +
"gbId=#{gbId}," +
"name=#{name}," +
"streamType=#{streamType}," +
"longitude=#{longitude}, " +
"latitude=#{latitude}, " +
"WHERE app=#{app} AND stream=#{stream} AND gbId=#{gbId}")
int update(GbStream gbStream);
@Delete("DELETE FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
int del(String app, String stream);
@Select("SELECT gs.*, pgs.platformId FROM gb_stream gs LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream")
List<GbStream> selectAll();
@Select("SELECT * FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
StreamProxyItem selectOne(String app, String stream);
@Select("SELECT gs.*, pgs.platformId FROM gb_stream gs " +
"LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
"WHERE gs.gbId = '${gbId}' AND pgs.platformId = '${platformId}'")
GbStream queryStreamInPlatform(String platformId, String gbId);
@Select("SELECT gs.*, pgs.platformId FROM gb_stream gs " +
"LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
"WHERE pgs.platformId = '${platformId}'")
List<GbStream> queryGbStreamListInPlatform(String platformId);
}

28
src/main/java/com/genersoft/iot/vmp/storager/dao/PlarfotmGbStreamMapper.java

@ -0,0 +1,28 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface PlarfotmGbStreamMapper {
@Insert("INSERT INTO platform_gb_stream (app, stream, platformId) VALUES" +
"('${app}', '${stream}', '${platformId}')")
int add(PlatformGbStream platformGbStream);
@Delete("DELETE FROM platform_gb_stream WHERE app=#{app} AND stream=#{stream}")
int delByAppAndStream(String app, String stream);
@Delete("DELETE FROM platform_gb_stream WHERE app=#{app} AND stream=#{stream}")
int delByPlatformId(String platformId);
@Select("SELECT * FROM platform_gb_stream WHERE app=#{app} AND stream=#{stream} AND platformId=#{platformId}")
StreamProxyItem selectOne(String app, String stream, String platformId);
}

2
src/main/java/com/genersoft/iot/vmp/storager/dao/PatformChannelMapper.java → src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java

@ -13,7 +13,7 @@ import java.util.List;
@Mapper @Mapper
@Repository @Repository
public interface PatformChannelMapper { public interface PlatformChannelMapper {
/** /**
* 查询列表里已经关联的 * 查询列表里已经关联的

18
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java

@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.storager.dao; package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -14,7 +14,7 @@ public interface StreamProxyMapper {
"timeout_ms, ffmpeg_cmd_key, rtp_type, enable_hls, enable_mp4, enable) VALUES" + "timeout_ms, ffmpeg_cmd_key, rtp_type, enable_hls, enable_mp4, enable) VALUES" +
"('${type}','${app}', '${stream}', '${url}', '${src_url}', '${dst_url}', " + "('${type}','${app}', '${stream}', '${url}', '${src_url}', '${dst_url}', " +
"'${timeout_ms}', '${ffmpeg_cmd_key}', '${rtp_type}', ${enable_hls}, ${enable_mp4}, ${enable} )") "'${timeout_ms}', '${ffmpeg_cmd_key}', '${rtp_type}', ${enable_hls}, ${enable_mp4}, ${enable} )")
int add(StreamProxyDto streamProxyDto); int add(StreamProxyItem streamProxyDto);
@Update("UPDATE stream_proxy " + @Update("UPDATE stream_proxy " +
"SET type=#{type}, " + "SET type=#{type}, " +
@ -30,17 +30,17 @@ public interface StreamProxyMapper {
"enable=#{enable}, " + "enable=#{enable}, " +
"enable_mp4=#{enable_mp4} " + "enable_mp4=#{enable_mp4} " +
"WHERE app=#{app} AND stream=#{stream}") "WHERE app=#{app} AND stream=#{stream}")
int update(StreamProxyDto streamProxyDto); int update(StreamProxyItem streamProxyDto);
@Delete("DELETE FROM stream_proxy WHERE app=#{app} AND stream=#{stream}") @Delete("DELETE FROM stream_proxy WHERE app=#{app} AND stream=#{stream}")
int del(String app, String stream); int del(String app, String stream);
@Select("SELECT * FROM stream_proxy") @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM stream_proxy st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream")
List<StreamProxyDto> selectAll(); List<StreamProxyItem> selectAll();
@Select("SELECT * FROM stream_proxy WHERE enable=${enable}") @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM stream_proxy st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable}")
List<StreamProxyDto> selectForEnable(boolean enable); List<StreamProxyItem> selectForEnable(boolean enable);
@Select("SELECT * FROM stream_proxy WHERE app=#{app} AND stream=#{stream}") @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM stream_proxy st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
StreamProxyDto selectOne(String app, String stream); StreamProxyItem selectOne(String app, String stream);
} }

102
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@ -2,21 +2,20 @@ package com.genersoft.iot.vmp.storager.impl;
import java.util.*; import java.util.*;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
import com.genersoft.iot.vmp.storager.dao.*; import com.genersoft.iot.vmp.storager.dao.*;
import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce; import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
/** /**
@ -27,6 +26,11 @@ import org.springframework.transaction.annotation.Transactional;
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Component @Component
public class VideoManagerStoragerImpl implements IVideoManagerStorager { public class VideoManagerStoragerImpl implements IVideoManagerStorager {
@Autowired
DataSourceTransactionManager dataSourceTransactionManager;
@Autowired
TransactionDefinition transactionDefinition;
@Autowired @Autowired
private DeviceMapper deviceMapper; private DeviceMapper deviceMapper;
@ -44,12 +48,13 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
private IRedisCatchStorage redisCatchStorage; private IRedisCatchStorage redisCatchStorage;
@Autowired @Autowired
private PatformChannelMapper patformChannelMapper; private PlatformChannelMapper platformChannelMapper;
@Autowired @Autowired
private StreamProxyMapper streamProxyMapper; private StreamProxyMapper streamProxyMapper;
@Autowired
private GbStreamMapper gbStreamMapper;
/** /**
@ -283,7 +288,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
public boolean deleteParentPlatform(ParentPlatform parentPlatform) { public boolean deleteParentPlatform(ParentPlatform parentPlatform) {
int result = platformMapper.delParentPlatform(parentPlatform); int result = platformMapper.delParentPlatform(parentPlatform);
// 删除关联的通道 // 删除关联的通道
patformChannelMapper.cleanChannelForGB(parentPlatform.getServerGBId()); platformChannelMapper.cleanChannelForGB(parentPlatform.getServerGBId());
return result > 0; return result > 0;
} }
@ -333,7 +338,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
} }
List<String> deviceAndChannelList = new ArrayList<>(deviceAndChannels.keySet()); List<String> deviceAndChannelList = new ArrayList<>(deviceAndChannels.keySet());
// 查询当前已经存在的 // 查询当前已经存在的
List<String> relatedPlatformchannels = patformChannelMapper.findChannelRelatedPlatform(platformId, deviceAndChannelList); List<String> relatedPlatformchannels = platformChannelMapper.findChannelRelatedPlatform(platformId, deviceAndChannelList);
if (relatedPlatformchannels != null) { if (relatedPlatformchannels != null) {
deviceAndChannelList.removeAll(relatedPlatformchannels); deviceAndChannelList.removeAll(relatedPlatformchannels);
} }
@ -344,7 +349,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
// 对剩下的数据进行存储 // 对剩下的数据进行存储
int result = 0; int result = 0;
if (channelReducesToAdd.size() > 0) { if (channelReducesToAdd.size() > 0) {
result = patformChannelMapper.addChannels(platformId, channelReducesToAdd); result = platformChannelMapper.addChannels(platformId, channelReducesToAdd);
} }
return result; return result;
@ -354,20 +359,20 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
@Override @Override
public int delChannelForGB(String platformId, List<ChannelReduce> channelReduces) { public int delChannelForGB(String platformId, List<ChannelReduce> channelReduces) {
int result = patformChannelMapper.delChannelForGB(platformId, channelReduces); int result = platformChannelMapper.delChannelForGB(platformId, channelReduces);
return result; return result;
} }
@Override @Override
public DeviceChannel queryChannelInParentPlatform(String platformId, String channelId) { public DeviceChannel queryChannelInParentPlatform(String platformId, String channelId) {
DeviceChannel channel = patformChannelMapper.queryChannelInParentPlatform(platformId, channelId); DeviceChannel channel = platformChannelMapper.queryChannelInParentPlatform(platformId, channelId);
return channel; return channel;
} }
@Override @Override
public Device queryVideoDeviceByPlatformIdAndChannelId(String platformId, String channelId) { public Device queryVideoDeviceByPlatformIdAndChannelId(String platformId, String channelId) {
Device device = patformChannelMapper.queryVideoDeviceByPlatformIdAndChannelId(platformId, channelId); Device device = platformChannelMapper.queryVideoDeviceByPlatformIdAndChannelId(platformId, channelId);
return device; return device;
} }
@ -390,27 +395,54 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
/** /**
* 新增代理流 * 新增代理流
* @param streamProxyDto * @param streamProxyItem
* @return * @return
*/ */
@Override @Override
public int addStreamProxy(StreamProxyDto streamProxyDto) { public boolean addStreamProxy(StreamProxyItem streamProxyItem) {
return streamProxyMapper.add(streamProxyDto); TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
boolean result = false;
streamProxyItem.setStreamType("proxy");
try {
if (gbStreamMapper.add(streamProxyItem)<0 || streamProxyMapper.add(streamProxyItem) < 0) {
//事务回滚
dataSourceTransactionManager.rollback(transactionStatus);
}
result = true;
dataSourceTransactionManager.commit(transactionStatus); //手动提交
}catch (Exception e) {
dataSourceTransactionManager.rollback(transactionStatus);
}
return result;
} }
/** /**
* 更新代理流 * 更新代理流
* @param streamProxyDto * @param streamProxyItem
* @return * @return
*/ */
@Override @Override
public int updateStreamProxy(StreamProxyDto streamProxyDto) { public boolean updateStreamProxy(StreamProxyItem streamProxyItem) {
return streamProxyMapper.update(streamProxyDto); TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
boolean result = false;
streamProxyItem.setStreamType("proxy");
try {
if (gbStreamMapper.update(streamProxyItem)<0 || streamProxyMapper.update(streamProxyItem) < 0) {
//事务回滚
dataSourceTransactionManager.rollback(transactionStatus);
}
dataSourceTransactionManager.commit(transactionStatus); //手动提交
result = true;
}catch (Exception e) {
dataSourceTransactionManager.rollback(transactionStatus);
}
return result;
} }
/** /**
* 移除代理流 * 移除代理流
* @param id * @param app
* @param stream
* @return * @return
*/ */
@Override @Override
@ -424,7 +456,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
* @return * @return
*/ */
@Override @Override
public List<StreamProxyDto> getStreamProxyListForEnable(boolean enable) { public List<StreamProxyItem> getStreamProxyListForEnable(boolean enable) {
return streamProxyMapper.selectForEnable(enable); return streamProxyMapper.selectForEnable(enable);
} }
@ -435,12 +467,32 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
* @return * @return
*/ */
@Override @Override
public PageInfo<StreamProxyDto> queryStreamProxyList(Integer page, Integer count) { public PageInfo<StreamProxyItem> queryStreamProxyList(Integer page, Integer count) {
PageHelper.startPage(page, count); PageHelper.startPage(page, count);
List<StreamProxyDto> all = streamProxyMapper.selectAll(); List<StreamProxyItem> all = streamProxyMapper.selectAll();
return new PageInfo<>(all); return new PageInfo<>(all);
} }
/**
* 根据国标ID获取平台关联的直播流
* @param platformId
* @param gbId
* @return
*/
@Override
public GbStream queryStreamInParentPlatform(String platformId, String gbId) {
return gbStreamMapper.queryStreamInPlatform(platformId, gbId);
}
/**
* 获取平台关联的直播流
* @param platformId
* @return
*/
@Override
public List<GbStream> queryGbStreamListInPlatform(String platformId) {
return gbStreamMapper.queryGbStreamListInPlatform(platformId);
}
/** /**
* 按照是app和stream获取代理流 * 按照是app和stream获取代理流
@ -449,7 +501,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
* @return * @return
*/ */
@Override @Override
public StreamProxyDto queryStreamProxy(String app, String stream){ public StreamProxyItem queryStreamProxy(String app, String stream){
return streamProxyMapper.selectOne(app, stream); return streamProxyMapper.selectOne(app, stream);
} }
} }

65
src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/GbStreamController.java

@ -0,0 +1,65 @@
package com.genersoft.iot.vmp.vmanager.gbStream;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.gbStream.bean.GbStreamParam;
import com.genersoft.iot.vmp.vmanager.platform.bean.UpdateChannelParam;
import com.genersoft.iot.vmp.vmanager.service.IGbStreamService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@CrossOrigin
@RestController
@RequestMapping("/api/gbStream")
public class GbStreamController {
private final static Logger logger = LoggerFactory.getLogger(GbStreamController.class);
@Autowired
private IGbStreamService gbStreamService;
@Autowired
private IVideoManagerStorager storager;
@RequestMapping(value = "/list")
@ResponseBody
public PageInfo<GbStream> list(@RequestParam(required = false)Integer page,
@RequestParam(required = false)Integer count){
return gbStreamService.getAll(page, count);
}
@RequestMapping(value = "/del")
@ResponseBody
public Object del(@RequestBody GbStreamParam gbStreamParam){
System.out.println(2222);
System.out.println(gbStreamParam.getGbStreams().size());
if (gbStreamService.delPlatformInfo(gbStreamParam.getGbStreams())) {
return "success";
}else {
return "fail";
}
}
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestBody GbStreamParam gbStreamParam){
System.out.println(3333);
System.out.println(gbStreamParam.getGbStreams().size());
if (gbStreamService.addPlatformInfo(gbStreamParam.getGbStreams(), gbStreamParam.getPlatformId())) {
return "success";
}else {
return "fail";
}
}
}

28
src/main/java/com/genersoft/iot/vmp/vmanager/gbStream/bean/GbStreamParam.java

@ -0,0 +1,28 @@
package com.genersoft.iot.vmp.vmanager.gbStream.bean;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import java.util.List;
public class GbStreamParam {
private String platformId;
private List<GbStream> gbStreams;
public String getPlatformId() {
return platformId;
}
public void setPlatformId(String platformId) {
this.platformId = platformId;
}
public List<GbStream> getGbStreams() {
return gbStreams;
}
public void setGbStreams(List<GbStream> gbStreams) {
this.gbStreams = gbStreams;
}
}

3
src/main/java/com/genersoft/iot/vmp/vmanager/media/MediaController.java

@ -46,7 +46,4 @@ public class MediaController {
return mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream); return mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream);
} }
} }

35
src/main/java/com/genersoft/iot/vmp/vmanager/platformGbStream/PlatformGbStreamController.java

@ -0,0 +1,35 @@
package com.genersoft.iot.vmp.vmanager.platformGbStream;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.service.IGbStreamService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@CrossOrigin
@RestController
@RequestMapping("/api")
public class PlatformGbStreamController {
private final static Logger logger = LoggerFactory.getLogger(PlatformGbStreamController.class);
@Autowired
private IGbStreamService gbStreamService;
@Autowired
private IVideoManagerStorager storager;
@RequestMapping(value = "/list")
@ResponseBody
public PageInfo<GbStream> list(@RequestParam(required = false)Integer page,
@RequestParam(required = false)Integer count){
return gbStreamService.getAll(page, count);
}
}

13
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java

@ -163,20 +163,7 @@ public class PlayController {
JSONObject data = jsonObject.getJSONObject("data"); JSONObject data = jsonObject.getJSONObject("data");
if (data != null) { if (data != null) {
result.put("key", data.getString("key")); result.put("key", data.getString("key"));
// StreamInfo streamInfoResult = new StreamInfo();
// streamInfoResult.setRtmp(dstUrl);
// streamInfoResult.setRtsp(String.format("rtsp://%s:%s/convert/%s", mediaInfo.getWanIp(), mediaInfo.getRtspPort(), streamId));
// streamInfoResult.setStreamId(streamId);
// streamInfoResult.setFlv(String.format("http://%s:%s/convert/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
// streamInfoResult.setWs_flv(String.format("ws://%s:%s/convert/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
// streamInfoResult.setHls(String.format("http://%s:%s/convert/%s/hls.m3u8", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
// streamInfoResult.setWs_hls(String.format("ws://%s:%s/convert/%s/hls.m3u8", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
// streamInfoResult.setFmp4(String.format("http://%s:%s/convert/%s.live.mp4", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
// streamInfoResult.setWs_fmp4(String.format("ws://%s:%s/convert/%s.live.mp4", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
// streamInfoResult.setTs(String.format("http://%s:%s/convert/%s.live.ts", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
// streamInfoResult.setWs_ts(String.format("ws://%s:%s/convert/%s.live.ts", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStream("convert", streamId); StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStream("convert", streamId);
streamInfoResult.setStreamId(streamId);
result.put("data", streamInfoResult); result.put("data", streamInfoResult);
} }
}else { }else {

41
src/main/java/com/genersoft/iot/vmp/vmanager/service/IGbStreamService.java

@ -0,0 +1,41 @@
package com.genersoft.iot.vmp.vmanager.service;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;
import com.github.pagehelper.PageInfo;
import java.util.List;
/**
* 级联国标平台关联流业务接口
*/
public interface IGbStreamService {
/**
* 分页获取所有
* @param page
* @param count
* @return
*/
PageInfo<GbStream> getAll(Integer page, Integer count);
/**
* 移除
* @param app
* @param stream
*/
void del(String app, String stream);
/**
* 保存国标关联
* @param gbStreams
*/
boolean addPlatformInfo(List<GbStream> gbStreams, String platformId);
/**
* 移除国标关联
* @param gbStreams
*/
boolean delPlatformInfo(List<GbStream> gbStreams);
}

11
src/main/java/com/genersoft/iot/vmp/vmanager/service/IStreamProxyService.java

@ -1,8 +1,7 @@
package com.genersoft.iot.vmp.vmanager.service; package com.genersoft.iot.vmp.vmanager.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.vmanager.streamProxy.StreamProxyController;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
public interface IStreamProxyService { public interface IStreamProxyService {
@ -11,21 +10,21 @@ public interface IStreamProxyService {
* 保存视频代理 * 保存视频代理
* @param param * @param param
*/ */
void save(StreamProxyDto param); void save(StreamProxyItem param);
/** /**
* 添加视频代理到zlm * 添加视频代理到zlm
* @param param * @param param
* @return * @return
*/ */
JSONObject addStreamProxyToZlm(StreamProxyDto param); JSONObject addStreamProxyToZlm(StreamProxyItem param);
/** /**
* 从zlm移除视频代理 * 从zlm移除视频代理
* @param param * @param param
* @return * @return
*/ */
JSONObject removeStreamProxyFromZlm(StreamProxyDto param); JSONObject removeStreamProxyFromZlm(StreamProxyItem param);
/** /**
* 分页查询 * 分页查询
@ -33,7 +32,7 @@ public interface IStreamProxyService {
* @param count * @param count
* @return * @return
*/ */
PageInfo<StreamProxyDto> getAll(Integer page, Integer count); PageInfo<StreamProxyItem> getAll(Integer page, Integer count);
/** /**
* 删除视频代理 * 删除视频代理

89
src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/GbStreamServiceImpl.java

@ -0,0 +1,89 @@
package com.genersoft.iot.vmp.vmanager.service.impl;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
import com.genersoft.iot.vmp.storager.dao.PlarfotmGbStreamMapper;
import com.genersoft.iot.vmp.vmanager.platform.PlatformController;
import com.genersoft.iot.vmp.vmanager.service.IGbStreamService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import java.util.List;
@Service
public class GbStreamServiceImpl implements IGbStreamService {
private final static Logger logger = LoggerFactory.getLogger(GbStreamServiceImpl.class);
@Autowired
DataSourceTransactionManager dataSourceTransactionManager;
@Autowired
TransactionDefinition transactionDefinition;
@Autowired
private GbStreamMapper gbStreamMapper;
@Autowired
private PlarfotmGbStreamMapper plarfotmGbStreamMapper;
@Override
public PageInfo<GbStream> getAll(Integer page, Integer count) {
PageHelper.startPage(page, count);
List<GbStream> all = gbStreamMapper.selectAll();
return new PageInfo<>(all);
}
@Override
public void del(String app, String stream) {
gbStreamMapper.del(app, stream);
}
@Override
public boolean addPlatformInfo(List<GbStream> gbStreams, String platformId) {
// 放在事务内执行
boolean result = false;
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
try {
for (GbStream gbStream : gbStreams) {
gbStream.setPlatformId(platformId);
plarfotmGbStreamMapper.add(gbStream);
}
dataSourceTransactionManager.commit(transactionStatus); //手动提交
result = true;
}catch (Exception e) {
logger.error("批量保存流与平台的关系时错误", e);
dataSourceTransactionManager.rollback(transactionStatus);
}
return result;
}
@Override
public boolean delPlatformInfo(List<GbStream> gbStreams) {
// 放在事务内执行
boolean result = false;
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
try {
for (GbStream gbStream : gbStreams) {
plarfotmGbStreamMapper.delByAppAndStream(gbStream.getApp(), gbStream.getStream());
}
dataSourceTransactionManager.commit(transactionStatus); //手动提交
result = true;
}catch (Exception e) {
logger.error("批量移除流与平台的关系时错误", e);
dataSourceTransactionManager.rollback(transactionStatus);
}
return result;
}
}

2
src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/MediaServiceImpl.java

@ -27,6 +27,8 @@ public class MediaServiceImpl implements IMediaService {
public StreamInfo getStreamInfoByAppAndStream(String app, String stream) { public StreamInfo getStreamInfoByAppAndStream(String app, String stream) {
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
StreamInfo streamInfoResult = new StreamInfo(); StreamInfo streamInfoResult = new StreamInfo();
streamInfoResult.setStreamId(stream);
streamInfoResult.setApp(app);
streamInfoResult.setRtmp(String.format("rtmp://%s:%s/%s/%s", mediaInfo.getWanIp(), mediaInfo.getRtmpPort(), app, stream)); streamInfoResult.setRtmp(String.format("rtmp://%s:%s/%s/%s", mediaInfo.getWanIp(), mediaInfo.getRtmpPort(), app, stream));
streamInfoResult.setRtsp(String.format("rtsp://%s:%s/%s/%s", mediaInfo.getWanIp(), mediaInfo.getRtspPort(), app, stream)); streamInfoResult.setRtsp(String.format("rtsp://%s:%s/%s/%s", mediaInfo.getWanIp(), mediaInfo.getRtspPort(), app, stream));
streamInfoResult.setFlv(String.format("http://%s:%s/%s/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), app, stream)); streamInfoResult.setFlv(String.format("http://%s:%s/%s/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), app, stream));

19
src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java

@ -153,27 +153,8 @@ public class PlayServiceImpl implements IPlayService {
public StreamInfo onPublishHandler(JSONObject resonse, String deviceId, String channelId, String uuid) { public StreamInfo onPublishHandler(JSONObject resonse, String deviceId, String channelId, String uuid) {
String streamId = resonse.getString("id"); String streamId = resonse.getString("id");
StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream("rtp", streamId); StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream("rtp", streamId);
// StreamInfo streamInfo = new StreamInfo();
streamInfo.setStreamId(streamId);
streamInfo.setDeviceID(deviceId); streamInfo.setDeviceID(deviceId);
streamInfo.setChannelId(channelId); streamInfo.setChannelId(channelId);
// MediaServerConfig mediaServerConfig = redisCatchStorage.getMediaInfo();
// streamInfo.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaServerConfig.getWanIp(), mediaServerConfig.getHttpPort(), streamId));
// streamInfo.setWs_flv(String.format("ws://%s:%s/rtp/%s.flv", mediaServerConfig.getWanIp(), mediaServerConfig.getHttpPort(), streamId));
//
// streamInfo.setFmp4(String.format("http://%s:%s/rtp/%s.live.mp4", mediaServerConfig.getWanIp(), mediaServerConfig.getHttpPort(), streamId));
// streamInfo.setWs_fmp4(String.format("ws://%s:%s/rtp/%s.live.mp4", mediaServerConfig.getWanIp(), mediaServerConfig.getHttpPort(), streamId));
//
// streamInfo.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaServerConfig.getWanIp(), mediaServerConfig.getHttpPort(), streamId));
// streamInfo.setWs_hls(String.format("ws://%s:%s/rtp/%s/hls.m3u8", mediaServerConfig.getWanIp(), mediaServerConfig.getHttpPort(), streamId));
//
// streamInfo.setTs(String.format("http://%s:%s/rtp/%s.live.ts", mediaServerConfig.getWanIp(), mediaServerConfig.getHttpPort(), streamId));
// streamInfo.setWs_ts(String.format("ws://%s:%s/rtp/%s.live.ts", mediaServerConfig.getWanIp(), mediaServerConfig.getHttpPort(), streamId));
//
// streamInfo.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaServerConfig.getWanIp(), mediaServerConfig.getRtmpPort(), streamId));
// streamInfo.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaServerConfig.getWanIp(), mediaServerConfig.getRtspPort(), streamId));
return streamInfo; return streamInfo;
} }

56
src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/StreamProxyServiceImpl.java

@ -2,21 +2,18 @@ package com.genersoft.iot.vmp.vmanager.service.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.MediaServerConfig; import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
import com.genersoft.iot.vmp.storager.dao.PlarfotmGbStreamMapper;
import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper; import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService; import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService;
import com.genersoft.iot.vmp.vmanager.streamProxy.StreamProxyController;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* 视频代理业务 * 视频代理业务
*/ */
@ -35,29 +32,35 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
@Autowired @Autowired
private StreamProxyMapper streamProxyMapper; private StreamProxyMapper streamProxyMapper;
@Autowired
private GbStreamMapper gbStreamMapper;
@Autowired
private PlarfotmGbStreamMapper plarfotmGbStreamMapper;
@Override @Override
public void save(StreamProxyDto param) { public void save(StreamProxyItem param) {
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(), String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(),
param.getStream() ); param.getStream() );
param.setDst_url(dstUrl); param.setDst_url(dstUrl);
// 更新 // 更新
if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) { if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) {
int result = videoManagerStorager.updateStreamProxy(param); boolean result = videoManagerStorager.updateStreamProxy(param);
if (result > 0 && param.isEnable()) { if (result && param.isEnable()) {
addStreamProxyToZlm(param); addStreamProxyToZlm(param);
} }
}else { // 新增 }else { // 新增
int result = videoManagerStorager.addStreamProxy(param); boolean result = videoManagerStorager.addStreamProxy(param);
if (result > 0 && param.isEnable()) { if (result && param.isEnable()) {
addStreamProxyToZlm(param); addStreamProxyToZlm(param);
} }
} }
} }
@Override @Override
public JSONObject addStreamProxyToZlm(StreamProxyDto param) { public JSONObject addStreamProxyToZlm(StreamProxyItem param) {
JSONObject result = null; JSONObject result = null;
if ("default".equals(param.getType())){ if ("default".equals(param.getType())){
result = zlmresTfulUtils.addStreamProxy(param.getApp(), param.getStream(), param.getUrl(), result = zlmresTfulUtils.addStreamProxy(param.getApp(), param.getStream(), param.getUrl(),
@ -70,37 +73,42 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
} }
@Override @Override
public JSONObject removeStreamProxyFromZlm(StreamProxyDto param) { public JSONObject removeStreamProxyFromZlm(StreamProxyItem param) {
JSONObject result = zlmresTfulUtils.closeStreams(param.getApp(), param.getStream()); JSONObject result = zlmresTfulUtils.closeStreams(param.getApp(), param.getStream());
return result; return result;
} }
@Override @Override
public PageInfo<StreamProxyDto> getAll(Integer page, Integer count) { public PageInfo<StreamProxyItem> getAll(Integer page, Integer count) {
return videoManagerStorager.queryStreamProxyList(page, count); return videoManagerStorager.queryStreamProxyList(page, count);
} }
@Override @Override
public void del(String app, String stream) { public void del(String app, String stream) {
StreamProxyDto streamProxyDto = new StreamProxyDto(); StreamProxyItem streamProxyItem = new StreamProxyItem();
streamProxyDto.setApp(app); streamProxyItem.setApp(app);
streamProxyDto.setStream(stream); streamProxyItem.setStream(stream);
JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto); JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyItem);
if (jsonObject.getInteger("code") == 0) { if (jsonObject.getInteger("code") == 0) {
videoManagerStorager.deleteStreamProxy(app, stream); videoManagerStorager.deleteStreamProxy(app, stream);
// 如果关联了国标那么移除关联
gbStreamMapper.del(app, stream);
plarfotmGbStreamMapper.delByAppAndStream(app, stream);
// TODO 如果关联的推流, 那么状态设置为离线
} }
} }
@Override @Override
public boolean start(String app, String stream) { public boolean start(String app, String stream) {
boolean result = false; boolean result = false;
StreamProxyDto streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream); StreamProxyItem streamProxy = videoManagerStorager.queryStreamProxy(app, stream);
if (!streamProxyDto.isEnable() && streamProxyDto != null) { if (!streamProxy.isEnable() && streamProxy != null) {
JSONObject jsonObject = addStreamProxyToZlm(streamProxyDto); JSONObject jsonObject = addStreamProxyToZlm(streamProxy);
if (jsonObject.getInteger("code") == 0) { if (jsonObject.getInteger("code") == 0) {
result = true; result = true;
streamProxyDto.setEnable(true); streamProxy.setEnable(true);
videoManagerStorager.updateStreamProxy(streamProxyDto); videoManagerStorager.updateStreamProxy(streamProxy);
} }
} }
return result; return result;
@ -109,7 +117,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
@Override @Override
public boolean stop(String app, String stream) { public boolean stop(String app, String stream) {
boolean result = false; boolean result = false;
StreamProxyDto streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream); StreamProxyItem streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream);
if (streamProxyDto.isEnable() && streamProxyDto != null) { if (streamProxyDto.isEnable() && streamProxyDto != null) {
JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto); JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto);
if (jsonObject.getInteger("code") == 0) { if (jsonObject.getInteger("code") == 0) {

13
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java

@ -1,8 +1,7 @@
package com.genersoft.iot.vmp.vmanager.streamProxy; package com.genersoft.iot.vmp.vmanager.streamProxy;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService; import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -31,17 +30,17 @@ public class StreamProxyController {
@RequestMapping(value = "/list") @RequestMapping(value = "/list")
@ResponseBody @ResponseBody
public PageInfo<StreamProxyDto> list(@RequestParam(required = false)Integer page, public PageInfo<StreamProxyItem> list(@RequestParam(required = false)Integer page,
@RequestParam(required = false)Integer count, @RequestParam(required = false)Integer count,
@RequestParam(required = false)String q, @RequestParam(required = false)String q,
@RequestParam(required = false)Boolean online ){ @RequestParam(required = false)Boolean online ){
return streamProxyService.getAll(page, count); return streamProxyService.getAll(page, count);
} }
@RequestMapping(value = "/save") @RequestMapping(value = "/save")
@ResponseBody @ResponseBody
public Object save(@RequestBody StreamProxyDto param){ public Object save(@RequestBody StreamProxyItem param){
logger.info("添加代理: " + JSONObject.toJSONString(param)); logger.info("添加代理: " + JSONObject.toJSONString(param));
streamProxyService.save(param); streamProxyService.save(param);
return "success"; return "success";

BIN
src/main/resources/wvp.sqlite

Binary file not shown.

283
web_src/src/components/PLatformStreamList.vue

@ -0,0 +1,283 @@
<template>
<div id="pLatformStreamList">
<el-container>
<el-header>
<uiHeader></uiHeader>
</el-header>
<el-main>
<div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;">
<span style="font-size: 1rem; font-weight: bold;">直播级联列表</span>
</div>
<div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;font-size: 14px;">
<el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addStreamProxy">添加代理</el-button>
</div>
<devicePlayer ref="devicePlayer"></devicePlayer>
<el-table :data="streamProxyList" border style="width: 100%" :height="winHeight">
<el-table-column prop="app" label="应用名" align="center" show-overflow-tooltip/>
<el-table-column prop="stream" label="流ID" align="center" show-overflow-tooltip/>
<el-table-column prop="gbId" label="国标平台" align="center" show-overflow-tooltip/>
<el-table-column label="转HLS" width="120" align="center">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable_hls">已启用</el-tag>
<el-tag size="medium" type="info" v-if="!scope.row.enable_hls">未启用</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="MP4录制" width="120" align="center">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable_mp4">已启用</el-tag>
<el-tag size="medium" type="info" v-if="!scope.row.enable_mp4">未启用</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="启用" width="120" align="center">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable">已启用</el-tag>
<el-tag size="medium" type="info" v-if="!scope.row.enable">未启用</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="360" align="center" fixed="right">
<template slot-scope="scope">
<el-button-group>
<el-button size="mini" icon="el-icon-video-play" v-if="scope.row.enable" @click="play(scope.row)">播放</el-button>
<el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">停用</el-button>
<el-button size="mini" icon="el-icon-check" type="primary" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button>
<el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteStreamProxy(scope.row)">删除</el-button>
<!-- <el-button size="mini" icon="el-icon-position" type="primary" >加入国标</el-button> -->
</el-button-group>
</template>
</el-table-column>
</el-table>
<el-pagination
style="float: right"
@size-change="handleSizeChange"
@current-change="currentChange"
:current-page="currentPage"
:page-size="count"
:page-sizes="[15, 25, 35, 50]"
layout="total, sizes, prev, pager, next"
:total="total">
</el-pagination>
<streamProxyEdit ref="streamProxyEdit" ></streamProxyEdit>
</el-main>
</el-container>
</div>
</template>
<script>
import streamProxyEdit from './dialog/StreamProxyEdit.vue'
import devicePlayer from './dialog/devicePlayer.vue'
import uiHeader from './UiHeader.vue'
export default {
name: 'pLatformStreamList',
components: {
devicePlayer,
streamProxyEdit,
uiHeader
},
data() {
return {
streamProxyList: [],
currentPusher: {}, //
updateLooper: 0, //
currentDeviceChannelsLenth:0,
winHeight: window.innerHeight - 200,
currentPage:1,
count:15,
total:0,
getListLoading: false
};
},
computed: {
},
mounted() {
this.initData();
// this.updateLooper = setInterval(this.initData, 10000);
},
destroyed() {
this.$destroy('videojs');
clearTimeout(this.updateLooper);
},
methods: {
initData: function() {
this.getStreamProxyList();
},
currentChange: function(val){
this.currentPage = val;
this.getStreamProxyList();
},
handleSizeChange: function(val){
this.count = val;
this.getStreamProxyList();
},
getStreamProxyList: function() {
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/proxy/list`,{
params: {
page: that.currentPage,
count: that.count
}
} )
.then(function (res) {
console.log(res);
console.log(res.data.list);
that.total = res.data.total;
that.streamProxyList = res.data.list;
that.getListLoading = false;
})
.catch(function (error) {
console.log(error);
that.getListLoading = false;
});
},
addStreamProxy: function(){
this.$refs.streamProxyEdit.openDialog(null, this.initData)
},
saveStreamProxy: function(){
},
play: function(row){
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/media/getStreamInfoByAppAndStream`,{
params: {
app: row.app,
stream: row.stream
}
})
.then(function (res) {
that.getListLoading = false;
that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
streamInfo: res.data,
hasAudio: true
});
})
.catch(function (error) {
console.log(error);
that.getListLoading = false;
});
},
deleteStreamProxy: function(row){
console.log(1111)
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/proxy/del`,{
params: {
app: row.app,
stream: row.stream
}
})
.then(function (res) {
that.getListLoading = false;
that.initData()
})
.catch(function (error) {
console.log(error);
that.getListLoading = false;
});
},
start: function(row){
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/proxy/start`,{
params: {
app: row.app,
stream: row.stream
}
})
.then(function (res) {
that.getListLoading = false;
that.initData()
})
.catch(function (error) {
console.log(error);
that.getListLoading = false;
});
},
stop: function(row){
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/proxy/stop`,{
params: {
app: row.app,
stream: row.stream
}
})
.then(function (res) {
that.getListLoading = false;
that.initData()
})
.catch(function (error) {
console.log(error);
that.getListLoading = false;
});
}
}
};
</script>
<style>
.videoList {
display: flex;
flex-wrap: wrap;
align-content: flex-start;
}
.video-item {
position: relative;
width: 15rem;
height: 10rem;
margin-right: 1rem;
background-color: #000000;
}
.video-item-img {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
margin: auto;
width: 100%;
height: 100%;
}
.video-item-img:after {
content: "";
display: inline-block;
position: absolute;
z-index: 2;
top: 0;
bottom: 0;
left: 0;
right: 0;
margin: auto;
width: 3rem;
height: 3rem;
background-image: url("../assets/loading.png");
background-size: cover;
background-color: #000000;
}
.video-item-title {
position: absolute;
bottom: 0;
color: #000000;
background-color: #ffffff;
line-height: 1.5rem;
padding: 0.3rem;
width: 14.4rem;
}
.cpoy-btn {
cursor: pointer;
margin-right: 10px;
}
</style>

2
web_src/src/components/ParentPlatformList.vue

@ -19,7 +19,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable">已启用</el-tag> <el-tag size="medium" v-if="scope.row.enable">已启用</el-tag>
<el-tag size="medium" v-if="!scope.row.enable">未启用</el-tag> <el-tag size="medium" type="info" v-if="!scope.row.enable">未启用</el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

21
web_src/src/components/PushVideoList.vue

@ -19,10 +19,14 @@
</el-table-column> </el-table-column>
<el-table-column prop="totalReaderCount" label="在线人数" width="240" align="center"> <el-table-column prop="totalReaderCount" label="在线人数" width="240" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="createStamp" label="开始时间" align="center"> <el-table-column label="开始时间" align="center" >
<template slot-scope="scope">
<el-button-group>
{{dateFormat(parseInt(scope.row.createStamp))}}
</el-button-group>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="360" align="center" fixed="right"> <el-table-column label="操作" width="360" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button-group> <el-button-group>
@ -144,6 +148,19 @@
}, },
stopPuhsh: function(row){ stopPuhsh: function(row){
console.log(row) console.log(row)
},
dateFormat: function(/** timestamp=0 **/) {
var ts = arguments[0] || 0;
var t,y,m,d,h,i,s;
t = ts ? new Date(ts*1000) : new Date();
y = t.getFullYear();
m = t.getMonth()+1;
d = t.getDate();
h = t.getHours();
i = t.getMinutes();
s = t.getSeconds();
//
return y+'-'+(m<10?'0'+m:m)+'-'+(d<10?'0'+d:d)+' '+(h<10?'0'+h:h)+':'+(i<10?'0'+i:i)+':'+(s<10?'0'+s:s);
} }
} }

7
web_src/src/components/StreamProxyList.vue

@ -13,7 +13,8 @@
</div> </div>
<devicePlayer ref="devicePlayer"></devicePlayer> <devicePlayer ref="devicePlayer"></devicePlayer>
<el-table :data="streamProxyList" border style="width: 100%" :height="winHeight"> <el-table :data="streamProxyList" border style="width: 100%" :height="winHeight">
<el-table-column prop="app" label="应用名" align="center" show-overflow-tooltip/> <el-table-column prop="name" label="名称" align="center" show-overflow-tooltip/>
<el-table-column prop="app" label="流应用名" align="center" show-overflow-tooltip/>
<el-table-column prop="stream" label="流ID" align="center" show-overflow-tooltip/> <el-table-column prop="stream" label="流ID" align="center" show-overflow-tooltip/>
<el-table-column label="流地址" width="400" align="center" show-overflow-tooltip > <el-table-column label="流地址" width="400" align="center" show-overflow-tooltip >
<template slot-scope="scope"> <template slot-scope="scope">
@ -30,7 +31,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="gbId" label="国标编码" width="180" align="center" show-overflow-tooltip/>
<el-table-column label="转HLS" width="120" align="center"> <el-table-column label="转HLS" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
@ -56,7 +57,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="360" align="center" fixed="right"> <el-table-column label="操作" width="360" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button-group> <el-button-group>
@ -64,6 +64,7 @@
<el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">停用</el-button> <el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">停用</el-button>
<el-button size="mini" icon="el-icon-check" type="primary" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button> <el-button size="mini" icon="el-icon-check" type="primary" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button>
<el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteStreamProxy(scope.row)">删除</el-button> <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteStreamProxy(scope.row)">删除</el-button>
<!-- <el-button size="mini" icon="el-icon-position" type="primary" >加入国标</el-button> -->
</el-button-group> </el-button-group>
</template> </template>
</el-table-column> </el-table-column>

11
web_src/src/components/dialog/StreamProxyEdit.vue

@ -21,7 +21,10 @@
<el-option label="FFmpeg" value="ffmpeg"></el-option> <el-option label="FFmpeg" value="ffmpeg"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="应用名" prop="app"> <el-form-item label="名称" prop="name">
<el-input v-model="proxyParam.name" clearable></el-input>
</el-form-item>
<el-form-item label="流应用名" prop="app">
<el-input v-model="proxyParam.app" clearable></el-input> <el-input v-model="proxyParam.app" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="流ID" prop="stream"> <el-form-item label="流ID" prop="stream">
@ -39,6 +42,9 @@
<el-form-item label="FFmpeg命令模板" prop="ffmpeg_cmd_key" v-if="proxyParam.type=='ffmpeg'"> <el-form-item label="FFmpeg命令模板" prop="ffmpeg_cmd_key" v-if="proxyParam.type=='ffmpeg'">
<el-input v-model="proxyParam.ffmpeg_cmd_key" clearable></el-input> <el-input v-model="proxyParam.ffmpeg_cmd_key" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="国标编码" prop="gbId">
<el-input v-model="proxyParam.gbId" placeholder="设置国标编码可推送到国标" clearable></el-input>
</el-form-item>
<el-form-item label="拉流方式" prop="rtp_type" v-if="proxyParam.type=='default'"> <el-form-item label="拉流方式" prop="rtp_type" v-if="proxyParam.type=='default'">
<el-select <el-select
v-model="proxyParam.rtp_type" v-model="proxyParam.rtp_type"
@ -100,6 +106,7 @@ export default {
isLoging: false, isLoging: false,
onSubmit_text: "立即创建", onSubmit_text: "立即创建",
proxyParam: { proxyParam: {
name: null,
type: "default", type: "default",
app: null, app: null,
stream: null, stream: null,
@ -107,6 +114,7 @@ export default {
src_url: null, src_url: null,
timeout_ms: null, timeout_ms: null,
ffmpeg_cmd_key: null, ffmpeg_cmd_key: null,
gbId: null,
rtp_type: null, rtp_type: null,
enable: true, enable: true,
enable_hls: true, enable_hls: true,
@ -114,6 +122,7 @@ export default {
}, },
rules: { rules: {
name: [{ required: true, message: "请输入名称", trigger: "blur" }],
app: [{ required: true, message: "请输入应用名", trigger: "blur" }], app: [{ required: true, message: "请输入应用名", trigger: "blur" }],
stream: [{ required: true, message: "请输入流ID", trigger: "blur" }], stream: [{ required: true, message: "请输入流ID", trigger: "blur" }],
url: [{ required: true, message: "请输入要代理的流", trigger: "blur" }], url: [{ required: true, message: "请输入要代理的流", trigger: "blur" }],

8
web_src/src/components/dialog/chooseChannel.vue

@ -13,7 +13,11 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="直播流通道" name="streamchannel"> <el-tab-pane label="直播流通道" name="streamchannel">
<!-- TODO --> <el-container>
<el-main style="background-color: #FFF;">
<chooseChannelFoStream :platformId=platformId ></chooseChannelFoStream>
</el-main>
</el-container>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-dialog> </el-dialog>
@ -22,11 +26,13 @@
<script> <script>
import chooseChannelForGb from '../dialog/chooseChannelForGb.vue' import chooseChannelForGb from '../dialog/chooseChannelForGb.vue'
import chooseChannelFoStream from '../dialog/chooseChannelForStream.vue'
export default { export default {
name: 'chooseChannel', name: 'chooseChannel',
props: {}, props: {},
components: { components: {
chooseChannelForGb, chooseChannelForGb,
chooseChannelFoStream,
}, },
computed: { computed: {
// getPlayerShared: function () { // getPlayerShared: function () {

2
web_src/src/components/dialog/chooseChannelForGb.vue

@ -27,7 +27,7 @@
<el-table-column type="selection" width="55" align="center" fixed > </el-table-column> <el-table-column type="selection" width="55" align="center" fixed > </el-table-column>
<el-table-column prop="channelId" label="通道编号" width="210"> <el-table-column prop="channelId" label="通道编号" width="210">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="通道名称"> <el-table-column prop="name" label="通道名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="deviceId" label="设备编号" width="210" > <el-table-column prop="deviceId" label="设备编号" width="210" >
</el-table-column> </el-table-column>

215
web_src/src/components/dialog/chooseChannelForStream.vue

@ -0,0 +1,215 @@
<template>
<div id="chooseChannelFoStream" >
<el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" @selection-change="checkedChanage" >
<el-table-column type="selection" width="55" align="center" fixed > </el-table-column>
<el-table-column prop="name" label="名称" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="app" label="应用名" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="stream" label="流ID" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="gbId" label="国标编码" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="streamType" label="流来源" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column label="流来源" width="100" align="center">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.streamType == 'proxy'">拉流代理</el-tag>
<el-tag size="medium" v-if="scope.row.streamType == 'push'">推流</el-tag>
</div>
</template>
</el-table-column>
</el-table>
<el-pagination style="float: right;margin-top: 1rem;" @size-change="handleSizeChange" @current-change="currentChange" :current-page="currentPage" :page-size="count" :page-sizes="[10, 20, 30, 50]" layout="total, sizes, prev, pager, next" :total="total">
</el-pagination>
</div>
</template>
<script>
export default {
name: 'chooseChannelFoStream',
props: {},
computed: {
// getPlayerShared: function () {
// return {
// sharedUrl: window.location.host + '/' + this.videoUrl,
// sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>',
// sharedRtmp: this.videoUrl
// };
// }
},
props: ['platformId'],
created() {
this.initData();
},
data() {
return {
gbStreams: [],
gbChoosechannel:{},
searchSrt: "",
channelType: "",
online: "",
choosed: "",
currentPage: 0,
count: 10,
total: 0,
eventEnanle: false
};
},
watch:{
platformId(newData, oldData){
console.log(newData)
this.initData()
},
},
methods: {
initData: function() {
this.getChannelList();
},
currentChange: function (val) {
this.currentPage = val;
this.initData();
},
handleSizeChange: function (val) {
this.count = val;
console.log(val)
this.initData();
},
rowcheckedChanage: function (val, row) {
console.log(val)
console.log(row)
},
checkedChanage: function (val) {
var that = this;
if (!that.eventEnanle) {
return;
}
var tabelData = JSON.parse(JSON.stringify(this.$refs.gbStreamsTable.data));
console.log("checkedChanage")
console.log(val)
var newData = {};
var addData = [];
var delData = [];
if (val.length > 0) {
for (let i = 0; i < val.length; i++) {
const element = val[i];
var key = element.app + "_" + element.stream;
newData[key] = element;
if (!!!that.gbChoosechannel[key]){
addData.push(element)
}else{
delete that.gbChoosechannel[key]
}
}
var oldKeys = Object.keys(that.gbChoosechannel);
if (oldKeys.length > 0) {
for (let i = 0; i < oldKeys.length; i++) {
const key = oldKeys[i];
delData.push(that.gbChoosechannel[key])
}
}
}else{
var oldKeys = Object.keys(that.gbChoosechannel);
if (oldKeys.length > 0) {
for (let i = 0; i < oldKeys.length; i++) {
const key = oldKeys[i];
delData.push(that.gbChoosechannel[key])
}
}
}
that.gbChoosechannel = newData;
if (Object.keys(addData).length >0) {
console.log(addData)
that.$axios({
method:"post",
url:"/api/gbStream/add",
data:{
platformId: that.platformId,
gbStreams: addData,
}
}).then((res)=>{
console.log("保存成功")
}).catch(function (error) {
console.log(error);
});
}
if (Object.keys(delData).length >0) {
console.log(delData)
that.$axios({
method:"post",
url:"/api/gbStream/del",
data:{
gbStreams: delData,
}
}).then((res)=>{
console.log("移除成功")
}).catch(function (error) {
console.log(error);
});
}
},
shareAllCheckedChanage: function (val) {
this.chooseChanage(null, val)
},
getChannelList: function () {
let that = this;
this.$axios.get(`/api/gbStream/list`, {
params: {
page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
choosed: that.choosed,
platformId: that.platformId,
channelType: that.channelType
}
})
.then(function (res) {
that.total = res.data.total;
that.gbStreams = res.data.list;
that.gbChoosechannel = {};
//
that.$nextTick(() => {
that.$refs.gbStreamsTable.doLayout();
//
var chooseGBS = [];
for (let i = 0; i < res.data.list.length; i++) {
const row = res.data.list[i];
console.log(row.platformId)
if (row.platformId == that.platformId) {
that.$refs.gbStreamsTable.toggleRowSelection(row, true);
chooseGBS.push(row)
that.gbChoosechannel[row.app+ "_" + row.stream] = row;
}
}
that.eventEnanle = true;
// that.checkedChanage(chooseGBS)
})
console.log(that.gbChoosechannel)
})
.catch(function (error) {
console.log(error);
});
},
handleGBSelectionChange: function() {
this.initData();
},
}
};
</script>
<style>
</style>

7
web_src/src/components/dialog/devicePlayer.vue

@ -163,6 +163,7 @@ export default {
}, },
showVideoDialog: false, showVideoDialog: false,
streamId: '', streamId: '',
app : '',
convertKey: '', convertKey: '',
deviceId: '', deviceId: '',
channelId: '', channelId: '',
@ -198,7 +199,7 @@ export default {
if (tab.name == "codec") { if (tab.name == "codec") {
this.$axios({ this.$axios({
method: 'get', method: 'get',
url: '/zlm/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app=rtp&stream='+ this.streamId url: '/zlm/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
}).then(function (res) { }).then(function (res) {
that.tracksLoading = false; that.tracksLoading = false;
if (res.data.code == 0 && res.data.online) { if (res.data.code == 0 && res.data.online) {
@ -218,6 +219,7 @@ export default {
this.channelId = channelId; this.channelId = channelId;
this.deviceId = deviceId; this.deviceId = deviceId;
this.streamId = ""; this.streamId = "";
this.app = "";
this.videoUrl = "" this.videoUrl = ""
if (!!this.$refs.videoPlayer) { if (!!this.$refs.videoPlayer) {
this.$refs.videoPlayer.pause(); this.$refs.videoPlayer.pause();
@ -228,11 +230,11 @@ export default {
break; break;
case "record": case "record":
this.showVideoDialog = true; this.showVideoDialog = true;
this.videoHistory.date = param.date; this.videoHistory.date = param.date;
this.queryRecords() this.queryRecords()
break; break;
case "streamPlay": case "streamPlay":
this.tabActiveName = "media";
this.showRrecord = false, this.showRrecord = false,
this.showPtz = false, this.showPtz = false,
this.play(param.streamInfo, param.hasAudio) this.play(param.streamInfo, param.hasAudio)
@ -250,6 +252,7 @@ export default {
this.isLoging = false; this.isLoging = false;
this.videoUrl = streamInfo.ws_flv; this.videoUrl = streamInfo.ws_flv;
this.streamId = streamInfo.streamId; this.streamId = streamInfo.streamId;
this.app = streamInfo.app;
this.playFromStreamInfo(false, streamInfo) this.playFromStreamInfo(false, streamInfo)
}, },
coverPlay: function () { coverPlay: function () {

5
web_src/src/router/index.js

@ -6,6 +6,7 @@ import deviceList from '../components/DeviceList.vue'
import channelList from '../components/channelList.vue' import channelList from '../components/channelList.vue'
import pushVideoList from '../components/PushVideoList.vue' import pushVideoList from '../components/PushVideoList.vue'
import streamProxyList from '../components/StreamProxyList.vue' import streamProxyList from '../components/StreamProxyList.vue'
import pLatformStreamList from '../components/PLatformStreamList.vue'
import devicePosition from '../components/devicePosition.vue' import devicePosition from '../components/devicePosition.vue'
import login from '../components/Login.vue' import login from '../components/Login.vue'
import parentPlatformList from '../components/ParentPlatformList.vue' import parentPlatformList from '../components/ParentPlatformList.vue'
@ -33,6 +34,10 @@ export default new VueRouter({
path: '/pushVideoList', path: '/pushVideoList',
component: pushVideoList, component: pushVideoList,
}, },
{
path: '/pLatformStreamList',
component: pLatformStreamList,
},
{ {
path: '/streamProxyList', path: '/streamProxyList',
component: streamProxyList, component: streamProxyList,

Loading…
Cancel
Save