From 922a9e8b3216ee5b6fd36ce607eaa81f6adf70ca Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 二月 2023 14:52:33 +0800
Subject: [PATCH] 修复语音对讲返回的地址
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 25 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 33c02ad..511b98d 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,11 +2,15 @@
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.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.StreamContent;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -21,11 +25,15 @@
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;
+import java.util.UUID;
/**
* @author lin
@@ -40,6 +48,9 @@
@Autowired
private SIPCommander cmder;
+
+ @Autowired
+ private ZLMRTPServerFactory zlmrtpServerFactory;
@Autowired
private IVideoManagerStorage storager;
@@ -59,24 +70,37 @@
@Parameter(name = "startTime", description = "寮�濮嬫椂闂�", required = true)
@Parameter(name = "endTime", description = "缁撴潫鏃堕棿", required = true)
@GetMapping("/start/{deviceId}/{channelId}")
- public DeferredResult<WVPResult<StreamInfo>> play(@PathVariable String deviceId, @PathVariable String channelId,
- String startTime, String endTime) {
+ public DeferredResult<WVPResult<StreamContent>> 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));
}
+ String uuid = UUID.randomUUID().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId;
+ DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(30000L);
+ resultHolder.put(key, uuid, result);
- return playService.playBack(deviceId, channelId, startTime, endTime, null,
+ WVPResult<StreamContent> wvpResult = new WVPResult<>();
+
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setId(uuid);
+
+ 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());
+ wvpResult.setCode(playBackResult.getCode());
+ wvpResult.setMsg(playBackResult.getMsg());
+ if (playBackResult.getCode() == ErrorCode.SUCCESS.getCode()) {
+ StreamInfo streamInfo = (StreamInfo)playBackResult.getData();
+ wvpResult.setData(new StreamContent(streamInfo));
}
+ msg.setData(wvpResult);
+ resultHolder.invokeResult(msg);
});
+
+ return result;
}
@@ -92,7 +116,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());
+ }
}
@@ -101,13 +133,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);
}
@@ -116,13 +149,13 @@
@GetMapping("/resume/{streamId}")
public void playResume(@PathVariable String streamId) {
logger.info("playResume: "+streamId);
- StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (null == streamInfo) {
- 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);
}
@@ -138,7 +171,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 = "鍥炴斁鍊嶉�熸挱鏀�")
@@ -157,6 +194,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