From e30e28712f7ec5a3c5514484b34bdde11d0954c3 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期六, 24 十月 2020 15:26:11 +0800
Subject: [PATCH] 播放等待时间增加到30秒,避免部分设备(NVR)播放超时

---
 src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
index 20078a7..cc3961b 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
@@ -5,8 +5,11 @@
 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.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,6 +18,7 @@
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
 
+@CrossOrigin
 @RestController
 @RequestMapping("/api")
 public class PlaybackController {
@@ -30,12 +34,21 @@
 	@GetMapping("/playback/{deviceId}/{channelId}")
 	public ResponseEntity<String> 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));
+		}
+		
+		if (StringUtils.isEmpty(deviceId) || StringUtils.isEmpty(channelId)) {
+			String log = String.format("璁惧鍥炴斁 API璋冪敤澶辫触锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId);
+			logger.warn(log);
+			return new ResponseEntity<String>(log,HttpStatus.BAD_REQUEST);
+		}
+		
 		Device device = storager.queryVideoDevice(deviceId);
 		String ssrc = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
 		
 		if (logger.isDebugEnabled()) {
-			logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId));
-			logger.debug("璁惧棰勮 API璋冪敤锛宻src锛�"+ssrc+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(ssrc)));
+			logger.debug("璁惧鍥炴斁 API璋冪敤锛宻src锛�"+ssrc+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(ssrc)));
 		}
 		
 		if(ssrc!=null) {
@@ -43,7 +56,26 @@
 			json.put("ssrc", ssrc);
 			return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
 		} else {
-			logger.warn("璁惧棰勮API璋冪敤澶辫触锛�");
+			logger.warn("璁惧鍥炴斁API璋冪敤澶辫触锛�");
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
+	
+	@PostMapping("/playback/{ssrc}/stop")
+	public ResponseEntity<String> playStop(@PathVariable String ssrc){
+		
+		cmder.streamByeCmd(ssrc);
+		
+		if (logger.isDebugEnabled()) {
+			logger.debug(String.format("璁惧褰曞儚鍥炴斁鍋滄 API璋冪敤锛宻src锛�%s", ssrc));
+		}
+		
+		if(ssrc!=null) {
+			JSONObject json = new JSONObject();
+			json.put("ssrc", ssrc);
+			return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
+		} else {
+			logger.warn("璁惧褰曞儚鍥炴斁鍋滄API璋冪敤澶辫触锛�");
 			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}

--
Gitblit v1.8.0