From a7bf29a4cb208c84a4f74517366fff096be139a5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 20 六月 2023 14:17:44 +0800
Subject: [PATCH] 恢复默认值
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 131 ++++++++++++++++++++++++-------------------
1 files changed, 73 insertions(+), 58 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 ba8c757..29c776a 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,7 +1,8 @@
package com.genersoft.iot.vmp.web.gb28181;
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.common.InviteInfo;
+import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -9,14 +10,18 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
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.service.bean.InviteErrorCode;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;
import javax.sip.InvalidArgumentException;
@@ -27,7 +32,7 @@
* API鍏煎锛氬疄鏃剁洿鎾�
*/
@SuppressWarnings(value = {"rawtypes", "unchecked"})
-@CrossOrigin
+
@RestController
@RequestMapping(value = "/api/v1/stream")
public class ApiStreamController {
@@ -47,6 +52,9 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
+ private IInviteStreamService inviteStreamService;
+
+ @Autowired
private IDeviceService deviceService;
@Autowired
@@ -57,12 +65,12 @@
* @param serial 璁惧缂栧彿
* @param channel 閫氶亾搴忓彿 榛樿鍊�: 1
* @param code 閫氶亾缂栧彿,閫氳繃 /api/v1/device/channellist 鑾峰彇鐨� ChannelList.ID, 璇ュ弬鏁板拰 channel 浜岄�変竴浼犻�掑嵆鍙�
- * @param cdn TODO 杞帹 CDN 鍦板潃, 褰㈠: [rtmp|rtsp]://xxx, encodeURIComponent
- * @param audio TODO 鏄惁寮�鍚煶棰�, 榛樿 寮�鍚�
+ * @param cdn 杞帹 CDN 鍦板潃, 褰㈠: [rtmp|rtsp]://xxx, encodeURIComponent
+ * @param audio 鏄惁寮�鍚煶棰�, 榛樿 寮�鍚�
* @param transport 娴佷紶杈撴ā寮忥紝 榛樿 UDP
- * @param checkchannelstatus TODO 鏄惁妫�鏌ラ�氶亾鐘舵��, 榛樿 false, 琛ㄧず 鎷夋祦鍓嶄笉妫�鏌ラ�氶亾鐘舵�佹槸鍚﹀湪绾�
- * @param transportmode TODO 褰� transport=TCP 鏃舵湁鏁�, 鎸囩ず娴佷紶杈撲富琚姩妯″紡, 榛樿琚姩
- * @param timeout TODO 鎷夋祦瓒呮椂(绉�),
+ * @param checkchannelstatus 鏄惁妫�鏌ラ�氶亾鐘舵��, 榛樿 false, 琛ㄧず 鎷夋祦鍓嶄笉妫�鏌ラ�氶亾鐘舵�佹槸鍚﹀湪绾�
+ * @param transportmode 褰� transport=TCP 鏃舵湁鏁�, 鎸囩ず娴佷紶杈撲富琚姩妯″紡, 榛樿琚姩
+ * @param timeout 鎷夋祦瓒呮椂(绉�),
* @return
*/
@RequestMapping(value = "/start")
@@ -84,7 +92,7 @@
result.put("error","device[ " + serial + " ]鏈壘鍒�");
resultDeferredResult.setResult(result);
return resultDeferredResult;
- }else if (device.getOnline() == 0) {
+ }else if (!device.isOnLine()) {
JSONObject result = new JSONObject();
result.put("error","device[ " + code + " ]offline");
resultDeferredResult.setResult(result);
@@ -105,53 +113,60 @@
result.put("error","channel[ " + code + " ]鏈壘鍒�");
resultDeferredResult.setResult(result);
return resultDeferredResult;
- }else if (deviceChannel.getStatus() == 0) {
+ }else if (!deviceChannel.isStatus()) {
JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]offline");
resultDeferredResult.setResult(result);
return resultDeferredResult;
}
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
- PlayResult play = 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());
- result.put("WS_FLV", streamInfo.getWs_flv());
- result.put("RTMP", streamInfo.getRtmp());
- result.put("HLS", streamInfo.getHls());
- result.put("RTSP", streamInfo.getRtsp());
- result.put("WEBRTC", streamInfo.getRtc());
- 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);
+
+
+ playService.play(newMediaServerItem, serial, code,false, (errorCode, msg, data) -> {
+ if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+ if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
+ JSONObject result = new JSONObject();
+ result.put("StreamID", inviteInfo.getStreamInfo().getStream());
+ result.put("DeviceID", device.getDeviceId());
+ result.put("ChannelID", code);
+ result.put("ChannelName", deviceChannel.getName());
+ result.put("ChannelCustomName", "");
+ result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
+ result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
+ result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
+ result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
+ result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
+ result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().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);
+ }
+ }else {
+ JSONObject result = new JSONObject();
+ result.put("error", "channel[ " + code + " ] " + msg);
+ resultDeferredResult.setResult(result);
+ }
+ });
+
return resultDeferredResult;
}
@@ -172,27 +187,27 @@
){
- 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;
}
- Device device = deviceService.queryDevice(serial);
+ Device device = deviceService.getDevice(serial);
if (device == null) {
JSONObject result = new JSONObject();
result.put("error","鏈壘鍒拌澶�");
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;
}
--
Gitblit v1.8.0