From b6e604f2449bb65dfaafb0f0741ba54ff0d2f9c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 30 四月 2024 15:20:03 +0800
Subject: [PATCH] 修改云端录像详情页使用直接访问zlm的方式播放录像
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 196 +++++++++++++++++++++++++++---------------------
1 files changed, 111 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 8a1d079..be740c1 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -1,16 +1,19 @@
package com.genersoft.iot.vmp.web.gb28181;
import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.common.InviteInfo;
+import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.IDeviceService;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IPlayService;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,13 +46,13 @@
private UserSetting userSetting;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
private IDeviceService deviceService;
@Autowired
private IPlayService playService;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
/**
* 瀹炴椂鐩存挱 - 寮�濮嬬洿鎾�
@@ -64,7 +67,7 @@
* @param timeout 鎷夋祦瓒呮椂(绉�),
* @return
*/
- @RequestMapping(value = "/start")
+ @GetMapping("/start")
private DeferredResult<JSONObject> start(String serial ,
@RequestParam(required = false)Integer channel ,
@RequestParam(required = false)String code,
@@ -76,88 +79,111 @@
@RequestParam(required = false)String timeout
){
- DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10);
+ DeferredResult<JSONObject> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10);
Device device = storager.queryVideoDevice(serial);
if (device == null ) {
- JSONObject result = new JSONObject();
- result.put("error","device[ " + serial + " ]鏈壘鍒�");
- resultDeferredResult.setResult(result);
- return resultDeferredResult;
- }else if (device.getOnline() == 0) {
- JSONObject result = new JSONObject();
- result.put("error","device[ " + code + " ]offline");
- resultDeferredResult.setResult(result);
- return resultDeferredResult;
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","device[ " + serial + " ]鏈壘鍒�");
+ result.setResult(resultJSON);
+ return result;
+ }else if (!device.isOnLine()) {
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","device[ " + code + " ]offline");
+ result.setResult(resultJSON);
+ return result;
}
- resultDeferredResult.onTimeout(()->{
+ result.onTimeout(()->{
logger.info("鎾斁绛夊緟瓒呮椂");
- JSONObject result = new JSONObject();
- result.put("error","timeout");
- resultDeferredResult.setResult(result);
-
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","timeout");
+ result.setResult(resultJSON);
+ inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+ storager.stopPlay(serial, code);
// 娓呯悊RTP server
});
DeviceChannel deviceChannel = storager.queryChannel(serial, code);
if (deviceChannel == null) {
- JSONObject result = new JSONObject();
- result.put("error","channel[ " + code + " ]鏈壘鍒�");
- resultDeferredResult.setResult(result);
- return resultDeferredResult;
- }else if (deviceChannel.getStatus() == 0) {
- JSONObject result = new JSONObject();
- result.put("error","channel[ " + code + " ]offline");
- resultDeferredResult.setResult(result);
- return resultDeferredResult;
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","channel[ " + code + " ]鏈壘鍒�");
+ result.setResult(resultJSON);
+ return result;
+ }else if (!deviceChannel.isStatus()) {
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","channel[ " + code + " ]offline");
+ result.setResult(resultJSON);
+ return result;
}
- MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
- playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
- JSONObject result = new JSONObject();
- result.put("StreamID", streamInfo.getStream());
- result.put("DeviceID", device.getDeviceId());
- result.put("ChannelID", code);
- result.put("ChannelName", deviceChannel.getName());
- result.put("ChannelCustomName", "");
- result.put("FLV", streamInfo.getFlv().getUrl());
- result.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
- result.put("WS_FLV", streamInfo.getWs_flv().getUrl());
- result.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
- result.put("RTMP", streamInfo.getRtmp().getUrl());
- result.put("RTMPS", streamInfo.getRtmps().getUrl());
- result.put("HLS", streamInfo.getHls().getUrl());
- result.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl());
- result.put("RTSP", streamInfo.getRtsp().getUrl());
- result.put("RTSPS", streamInfo.getRtsps().getUrl());
- result.put("WEBRTC", streamInfo.getRtc().getUrl());
- result.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl());
- result.put("CDN", "");
- result.put("SnapURL", "");
- result.put("Transport", device.getTransport());
- result.put("StartAt", "");
- result.put("Duration", "");
- result.put("SourceVideoCodecName", "");
- result.put("SourceVideoWidth", "");
- result.put("SourceVideoHeight", "");
- result.put("SourceVideoFrameRate", "");
- result.put("SourceAudioCodecName", "");
- result.put("SourceAudioSampleRate", "");
- result.put("AudioEnable", "");
- result.put("Ondemand", "");
- result.put("InBytes", "");
- result.put("InBitRate", "");
- result.put("OutBytes", "");
- result.put("NumOutputs", "");
- result.put("CascadeSize", "");
- result.put("RelaySize", "");
- result.put("ChannelPTZType", "0");
- resultDeferredResult.setResult(result);
- }, (eventResult) -> {
- JSONObject result = new JSONObject();
- result.put("error", "channel[ " + code + " ] " + eventResult.msg);
- resultDeferredResult.setResult(result);
- }, null);
- return resultDeferredResult;
+ MediaServer newMediaServerItem = playService.getNewMediaServerItem(device);
+
+ playService.play(newMediaServerItem, serial, code, null, (errorCode, msg, data) -> {
+ if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
+ if (data != null) {
+ StreamInfo streamInfo = (StreamInfo)data;
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("StreamID", streamInfo.getStream());
+ resultJjson.put("DeviceID", serial);
+ resultJjson.put("ChannelID", code);
+ resultJjson.put("ChannelName", deviceChannel.getName());
+ resultJjson.put("ChannelCustomName", "");
+ resultJjson.put("FLV", streamInfo.getFlv().getUrl());
+ if(streamInfo.getHttps_flv() != null) {
+ resultJjson.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
+ }
+ resultJjson.put("WS_FLV", streamInfo.getWs_flv().getUrl());
+ if(streamInfo.getWss_flv() != null) {
+ resultJjson.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
+ }
+ resultJjson.put("RTMP", streamInfo.getRtmp().getUrl());
+ if (streamInfo.getRtmps() != null) {
+ resultJjson.put("RTMPS", streamInfo.getRtmps().getUrl());
+ }
+ resultJjson.put("HLS", streamInfo.getHls().getUrl());
+ if (streamInfo.getHttps_hls() != null) {
+ resultJjson.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl());
+ }
+ resultJjson.put("RTSP", streamInfo.getRtsp().getUrl());
+ if (streamInfo.getRtsps() != null) {
+ resultJjson.put("RTSPS", streamInfo.getRtsps().getUrl());
+ }
+ resultJjson.put("WEBRTC", streamInfo.getRtc().getUrl());
+ if (streamInfo.getRtcs() != null) {
+ resultJjson.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl());
+ }
+ resultJjson.put("CDN", "");
+ resultJjson.put("SnapURL", "");
+ resultJjson.put("Transport", device.getTransport());
+ resultJjson.put("StartAt", "");
+ resultJjson.put("Duration", "");
+ resultJjson.put("SourceVideoCodecName", "");
+ resultJjson.put("SourceVideoWidth", "");
+ resultJjson.put("SourceVideoHeight", "");
+ resultJjson.put("SourceVideoFrameRate", "");
+ resultJjson.put("SourceAudioCodecName", "");
+ resultJjson.put("SourceAudioSampleRate", "");
+ resultJjson.put("AudioEnable", "");
+ resultJjson.put("Ondemand", "");
+ resultJjson.put("InBytes", "");
+ resultJjson.put("InBitRate", "");
+ resultJjson.put("OutBytes", "");
+ resultJjson.put("NumOutputs", "");
+ resultJjson.put("CascadeSize", "");
+ resultJjson.put("RelaySize", "");
+ resultJjson.put("ChannelPTZType", "0");
+ result.setResult(resultJjson);
+ }else {
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("error", "channel[ " + code + " ] " + msg);
+ result.setResult(resultJjson);
+ }
+ }else {
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("error", "channel[ " + code + " ] " + msg);
+ result.setResult(resultJjson);
+ }
+ });
+
+ return result;
}
/**
@@ -168,7 +194,7 @@
* @param check_outputs
* @return
*/
- @RequestMapping(value = "/stop")
+ @GetMapping("/stop")
@ResponseBody
private JSONObject stop(String serial ,
@RequestParam(required = false)Integer channel ,
@@ -177,8 +203,8 @@
){
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
- if (streamInfo == null) {
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+ if (inviteInfo == null) {
JSONObject result = new JSONObject();
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
@@ -190,14 +216,14 @@
return result;
}
try {
- cmder.streamByeCmd(device, code, streamInfo.getStream(), null);
+ cmder.streamByeCmd(device, code, inviteInfo.getStream(), null);
} catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
JSONObject result = new JSONObject();
result.put("error","鍙戦�丅YE澶辫触锛�" + e.getMessage());
return result;
}
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ inviteStreamService.removeInviteInfo(inviteInfo);
+ storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
return null;
}
@@ -208,7 +234,7 @@
* @param code 閫氶亾鍥芥爣缂栧彿
* @return
*/
- @RequestMapping(value = "/touch")
+ @GetMapping("/touch")
@ResponseBody
private JSONObject touch(String serial ,String t,
@RequestParam(required = false)Integer channel ,
--
Gitblit v1.8.0