From 1de344674afd6bb35b51b165bbad76dbe6299b7e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 18:08:33 +0800
Subject: [PATCH] 使用冒号分隔redis的key
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 270 +++++++++++++++++++++++++++++------------------------
1 files changed, 146 insertions(+), 124 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
old mode 100644
new mode 100755
index 3607a8d..44431cf
--- 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
@@ -1,40 +1,51 @@
package com.genersoft.iot.vmp.vmanager.gb28181.playback;
+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.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
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.ZLMRESTfulUtils;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
-import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IPlayService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+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;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+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.StringUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.util.ObjectUtils;
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.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;
+import javax.servlet.http.HttpServletRequest;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.ParseException;
import java.util.UUID;
-@Api(tags = "瑙嗛鍥炴斁")
-@CrossOrigin
+/**
+ * @author lin
+ */
+@Tag(name = "瑙嗛鍥炴斁")
+
@RestController
@RequestMapping("/api/playback")
public class PlaybackController {
@@ -45,13 +56,10 @@
private SIPCommander cmder;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- // @Autowired
- // private ZLMRESTfulUtils zlmresTfulUtils;
+ private IInviteStreamService inviteStreamService;
@Autowired
private IPlayService playService;
@@ -60,147 +68,161 @@
private DeferredResultHolder resultHolder;
@Autowired
- private IMediaServerService mediaServerService;
+ private UserSetting userSetting;
- @ApiOperation("寮�濮嬭棰戝洖鏀�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "startTime", value = "寮�濮嬫椂闂�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "endTime", value = "缁撴潫鏃堕棿", dataTypeClass = String.class),
- })
+ @Operation(summary = "寮�濮嬭棰戝洖鏀�", security = @SecurityRequirement(name = JwtUtils.HEADER))
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "startTime", description = "寮�濮嬫椂闂�", required = true)
+ @Parameter(name = "endTime", description = "缁撴潫鏃堕棿", required = true)
@GetMapping("/start/{deviceId}/{channelId}")
- public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId, @PathVariable String channelId,
- String startTime,String endTime) {
+ public DeferredResult<WVPResult<StreamContent>> start(HttpServletRequest request, @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<ResponseEntity<String>> result = playService.playBack(deviceId, channelId, startTime, endTime, msg->{
- resultHolder.invokeResult(msg);
- });
+ String uuid = UUID.randomUUID().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId;
+ DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
+ resultHolder.put(key, uuid, result);
+
+ RequestMessage requestMessage = new RequestMessage();
+ requestMessage.setKey(key);
+ requestMessage.setId(uuid);
+
+ playService.playBack(deviceId, channelId, startTime, endTime,
+ (code, msg, data)->{
+
+ WVPResult<StreamContent> wvpResult = new WVPResult<>();
+ if (code == InviteErrorCode.SUCCESS.getCode()) {
+ wvpResult.setCode(ErrorCode.SUCCESS.getCode());
+ wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
+
+ if (data != null) {
+ StreamInfo streamInfo = (StreamInfo)data;
+ if (userSetting.getUseSourceIpAsStreamIp()) {
+ streamInfo=streamInfo.clone();//娣辨嫹璐�
+ String host;
+ try {
+ URL url=new URL(request.getRequestURL().toString());
+ host=url.getHost();
+ } catch (MalformedURLException e) {
+ host=request.getLocalAddr();
+ }
+ streamInfo.channgeStreamIp(host);
+ }
+ wvpResult.setData(new StreamContent(streamInfo));
+ }
+ }else {
+ wvpResult.setCode(code);
+ wvpResult.setMsg(msg);
+ }
+ requestMessage.setData(wvpResult);
+ resultHolder.invokeResult(requestMessage);
+ });
return result;
}
- @ApiOperation("鍋滄瑙嗛鍥炴斁")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
- })
+
+ @Operation(summary = "鍋滄瑙嗛鍥炴斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "stream", description = "娴両D", required = true)
@GetMapping("/stop/{deviceId}/{channelId}/{stream}")
- public ResponseEntity<String> playStop(
+ public void playStop(
@PathVariable String deviceId,
@PathVariable String channelId,
@PathVariable String stream) {
-
- cmder.streamByeCmd(deviceId, channelId, stream);
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧褰曞儚鍥炴斁鍋滄 API璋冪敤锛宒eviceId/channelId锛�%s/%s", deviceId, channelId));
+ if (ObjectUtils.isEmpty(deviceId) || ObjectUtils.isEmpty(channelId) || ObjectUtils.isEmpty(stream)) {
+ throw new ControllerException(ErrorCode.ERROR400);
}
- if (StringUtils.isEmpty(deviceId) || StringUtils.isEmpty(channelId) || StringUtils.isEmpty(stream)) {
- return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "璁惧锛�" + deviceId + " 鏈壘鍒�");
}
-
- if (deviceId != null && channelId != null) {
- JSONObject json = new JSONObject();
- json.put("deviceId", deviceId);
- json.put("channelId", channelId);
- return new ResponseEntity<>(json.toString(), HttpStatus.OK);
- } else {
- logger.warn("璁惧褰曞儚鍥炴斁鍋滄API璋冪敤澶辫触锛�");
- return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ try {
+ cmder.streamByeCmd(device, channelId, stream, null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍙戦�乥ye澶辫触锛� " + e.getMessage());
}
}
- @ApiOperation("鍥炴斁鏆傚仠")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
- })
+
+ @Operation(summary = "鍥炴斁鏆傚仠", security = @SecurityRequirement(name = JwtUtils.HEADER))
+ @Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@GetMapping("/pause/{streamId}")
- public ResponseEntity<String> playPause(@PathVariable String streamId) {
+ public void playPause(@PathVariable String streamId) {
logger.info("playPause: "+streamId);
- JSONObject json = new JSONObject();
- StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
- if (null == streamInfo) {
- json.put("msg", "streamId涓嶅瓨鍦�");
- logger.warn("streamId涓嶅瓨鍦�!");
- return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+
+ 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);
- json.put("msg", "ok");
- return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
}
- @ApiOperation("鍥炴斁鎭㈠")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
- })
+
+ @Operation(summary = "鍥炴斁鎭㈠", security = @SecurityRequirement(name = JwtUtils.HEADER))
+ @Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@GetMapping("/resume/{streamId}")
- public ResponseEntity<String> playResume(@PathVariable String streamId) {
+ public void playResume(@PathVariable String streamId) {
logger.info("playResume: "+streamId);
- JSONObject json = new JSONObject();
- StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
- if (null == streamInfo) {
- json.put("msg", "streamId涓嶅瓨鍦�");
- logger.warn("streamId涓嶅瓨鍦�!");
- return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ 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);
- json.put("msg", "ok");
- return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
}
- @ApiOperation("鍥炴斁鎷栧姩鎾斁")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
- @ApiImplicitParam(name = "seekTime", value = "鎷栧姩鍋忕Щ閲忥紝鍗曚綅s", dataTypeClass = Long.class),
- })
+
+ @Operation(summary = "鍥炴斁鎷栧姩鎾斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
+ @Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
+ @Parameter(name = "seekTime", description = "鎷栧姩鍋忕Щ閲忥紝鍗曚綅s", required = true)
@GetMapping("/seek/{streamId}/{seekTime}")
- public ResponseEntity<String> playSeek(@PathVariable String streamId, @PathVariable long seekTime) {
+ public void playSeek(@PathVariable String streamId, @PathVariable long seekTime) {
logger.info("playSeek: "+streamId+", "+seekTime);
- JSONObject json = new JSONObject();
- StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
- if (null == streamInfo) {
- json.put("msg", "streamId涓嶅瓨鍦�");
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, streamId);
+
+ if (null == inviteInfo || inviteInfo.getStreamInfo() == null) {
logger.warn("streamId涓嶅瓨鍦�!");
- return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
}
- Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playSeekCmd(device, streamInfo, seekTime);
- json.put("msg", "ok");
- return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ Device device = storager.queryVideoDevice(inviteInfo.getDeviceId());
+ try {
+ cmder.playSeekCmd(device, inviteInfo.getStreamInfo(), seekTime);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
}
- @ApiOperation("鍥炴斁鍊嶉�熸挱鏀�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
- @ApiImplicitParam(name = "speed", value = "鍊嶉��0.25 0.5 1銆�2銆�4", dataTypeClass = Double.class),
- })
+ @Operation(summary = "鍥炴斁鍊嶉�熸挱鏀�", security = @SecurityRequirement(name = JwtUtils.HEADER))
+ @Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
+ @Parameter(name = "speed", description = "鍊嶉��0.25 0.5 1銆�2銆�4", required = true)
@GetMapping("/speed/{streamId}/{speed}")
- public ResponseEntity<String> playSpeed(@PathVariable String streamId, @PathVariable Double speed) {
+ public void playSpeed(@PathVariable String streamId, @PathVariable Double speed) {
logger.info("playSpeed: "+streamId+", "+speed);
- JSONObject json = new JSONObject();
- StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
- if (null == streamInfo) {
- json.put("msg", "streamId涓嶅瓨鍦�");
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, streamId);
+
+ if (null == inviteInfo || inviteInfo.getStreamInfo() == null) {
logger.warn("streamId涓嶅瓨鍦�!");
- return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "streamId涓嶅瓨鍦�");
}
if(speed != 0.25 && speed != 0.5 && speed != 1 && speed != 2.0 && speed != 4.0) {
- json.put("msg", "涓嶆敮鎸佺殑speed锛�0.25 0.5 1銆�2銆�4锛�");
logger.warn("涓嶆敮鎸佺殑speed锛� " + speed);
- return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ 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);
- json.put("msg", "ok");
- return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ Device device = storager.queryVideoDevice(inviteInfo.getDeviceId());
+ try {
+ cmder.playSpeedCmd(device, inviteInfo.getStreamInfo(), speed);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+ }
}
-
}
--
Gitblit v1.8.0