From cf23816c80771c9e22bb50d0d89feb34d2edca79 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 一月 2022 16:42:58 +0800
Subject: [PATCH] 恢复合并的limit值
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 2 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 98df8dd..8f83e7c 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
@@ -30,7 +30,6 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;
-import javax.sip.message.Response;
import java.util.UUID;
@Api(tags = "瑙嗛鍥炴斁")
@@ -77,7 +76,7 @@
logger.debug(String.format("璁惧鍥炴斁 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
}
String uuid = UUID.randomUUID().toString();
- String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
+ String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId;
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(30000L);
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
@@ -152,4 +151,92 @@
return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
}
}
+
+ @ApiOperation("鍥炴斁鏆傚仠")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
+ })
+ @GetMapping("/pause/{streamId}")
+ public ResponseEntity<String> 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);
+ }
+ 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),
+ })
+ @GetMapping("/resume/{streamId}")
+ public ResponseEntity<String> 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);
+ }
+ 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),
+ })
+ @GetMapping("/seek/{streamId}/{seekTime}")
+ public ResponseEntity<String> 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涓嶅瓨鍦�");
+ logger.warn("streamId涓嶅瓨鍦�!");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ }
+ Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
+ cmder.playSeekCmd(device, streamInfo, seekTime);
+ json.put("msg", "ok");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ }
+
+ @ApiOperation("鍥炴斁鍊嶉�熸挱鏀�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "speed", value = "鍊嶉��0.25 0.5 1銆�2銆�4", dataTypeClass = Double.class),
+ })
+ @GetMapping("/speed/{streamId}/{speed}")
+ public ResponseEntity<String> 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涓嶅瓨鍦�");
+ logger.warn("streamId涓嶅瓨鍦�!");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ }
+ 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);
+ }
+ Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
+ cmder.playSpeedCmd(device, streamInfo, speed);
+ json.put("msg", "ok");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ }
+
}
--
Gitblit v1.8.0