From dfb87c768538e280cf5e17d1d5ee5bbed1e1888d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 十一月 2022 10:58:26 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
index e9b9ef7..696fae0 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -2,33 +2,40 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
-import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.springframework.web.context.request.async.DeferredResult;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
+
+/**
+ * @author lin
+ */
@Tag(name = "瑙嗛鍥炴斁")
@CrossOrigin
@RestController
@@ -39,6 +46,9 @@
@Autowired
private SIPCommander cmder;
+
+ @Autowired
+ private ZLMRTPServerFactory zlmrtpServerFactory;
@Autowired
private IVideoManagerStorage storager;
@@ -58,18 +68,24 @@
@Parameter(name = "startTime", description = "寮�濮嬫椂闂�", required = true)
@Parameter(name = "endTime", description = "缁撴潫鏃堕棿", required = true)
@GetMapping("/start/{deviceId}/{channelId}")
- public DeferredResult<String> play(@PathVariable String deviceId, @PathVariable String channelId,
- String startTime,String endTime) {
+ public DeferredResult<WVPResult<StreamInfo>> play(@PathVariable String deviceId, @PathVariable String channelId,
+ String startTime, String endTime) {
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧鍥炴斁 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
}
- DeferredResult<String> result = playService.playBack(deviceId, channelId, startTime, endTime, null, wvpResult->{
- resultHolder.invokeResult(wvpResult.getData());
- });
- return result;
+ return playService.playBack(deviceId, channelId, startTime, endTime, null,
+ playBackResult->{
+ if (playBackResult.getCode() != ErrorCode.SUCCESS.getCode()) {
+ RequestMessage data = playBackResult.getData();
+ data.setData(WVPResult.fail(playBackResult.getCode(), playBackResult.getMsg()));
+ resultHolder.invokeResult(data);
+ }else {
+ resultHolder.invokeResult(playBackResult.getData());
+ }
+ });
}
@@ -85,7 +101,15 @@
if (ObjectUtils.isEmpty(deviceId) || ObjectUtils.isEmpty(channelId) || ObjectUtils.isEmpty(stream)) {
throw new ControllerException(ErrorCode.ERROR400);
}
- cmder.streamByeCmd(deviceId, channelId, stream, null);
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "璁惧锛�" + deviceId + " 鏈壘鍒�");
+ }
+ try {
+ cmder.streamByeCmd(device, channelId, stream, null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍙戦�乥ye澶辫触锛� " + e.getMessage());
+ }
}
@@ -94,13 +118,14 @@
@GetMapping("/pause/{streamId}")
public void playPause(@PathVariable String streamId) {
logger.info("playPause: "+streamId);
- StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (null == streamInfo) {
- logger.warn("streamId涓嶅瓨鍦�!");
- throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
+
+ try {
+ playService.pauseRtp(streamId);
+ } catch (ServiceException e) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), e.getMessage());
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
- Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playPauseCmd(device, streamInfo);
}
@@ -109,15 +134,13 @@
@GetMapping("/resume/{streamId}")
public void playResume(@PathVariable String streamId) {
logger.info("playResume: "+streamId);
- JSONObject json = new JSONObject();
- StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (null == streamInfo) {
- json.put("msg", "streamId涓嶅瓨鍦�");
- logger.warn("streamId涓嶅瓨鍦�!");
- throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
+ try {
+ playService.resumeRtp(streamId);
+ } catch (ServiceException e) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), e.getMessage());
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
- Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playResumeCmd(device, streamInfo);
}
@@ -133,7 +156,11 @@
throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
}
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playSeekCmd(device, streamInfo, seekTime);
+ try {
+ cmder.playSeekCmd(device, streamInfo, seekTime);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
}
@Operation(summary = "鍥炴斁鍊嶉�熸挱鏀�")
@@ -152,6 +179,10 @@
throw new ControllerException(ErrorCode.ERROR100.getCode(), "涓嶆敮鎸佺殑speed锛�0.25 0.5 1銆�2銆�4锛�");
}
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playSpeedCmd(device, streamInfo, speed);
+ try {
+ cmder.playSpeedCmd(device, streamInfo, speed);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
}
}
--
Gitblit v1.8.0