From 0cc5917d8acca044b330721cd235caedc2023967 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 九月 2022 10:14:31 +0800
Subject: [PATCH] 修复通道更新
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 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 3ca6358..20860bf 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,10 +2,13 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
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;
@@ -19,11 +22,14 @@
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
@@ -57,8 +63,8 @@
@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));
@@ -66,7 +72,15 @@
return playService.playBack(deviceId, channelId, startTime, endTime, null,
- playBackResult->resultHolder.invokeResult(playBackResult.getData()));
+ 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());
+ }
+ });
}
@@ -82,7 +96,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());
+ }
}
@@ -97,7 +119,11 @@
throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
}
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playPauseCmd(device, streamInfo);
+ try {
+ cmder.playPauseCmd(device, streamInfo);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
}
@@ -112,7 +138,11 @@
throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
}
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playResumeCmd(device, streamInfo);
+ try {
+ cmder.playResumeCmd(device, streamInfo);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
}
@@ -128,7 +158,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 = "鍥炴斁鍊嶉�熸挱鏀�")
@@ -147,6 +181,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