From 08c45876df5121b5b750798bae3e658f0ec575c6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 十一月 2021 15:10:10 +0800
Subject: [PATCH] 优化倍速播放参数

---
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java |    9 +++++++--
 1 files changed, 7 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 90ecfd4..a029073 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
@@ -221,10 +221,10 @@
 	@ApiOperation("鍥炴斁鍊嶉�熸挱鏀�")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
-			@ApiImplicitParam(name = "speed", value = "鍊嶉�� 1銆�2銆�4", 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 String 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);
@@ -233,6 +233,11 @@
 			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);
+		}
 		setCseq(streamId);
 		Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
 		cmder.playSpeedCmd(device, streamInfo, speed);

--
Gitblit v1.8.0