From b9e4682d3ffb4446f41cf6170a3920a93d94f2d3 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期日, 10 五月 2020 22:33:43 +0800
Subject: [PATCH] 完善ssrc符合国标,并完善很多小问题

---
 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
index d8b7305..c470b3e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -10,7 +10,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+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;
 
 @RestController
 @RequestMapping("/api")
@@ -21,10 +23,14 @@
 	@Autowired
 	private SIPCommander cmder;
 	
-	@GetMapping("/play/{deviceId}_{channelId}")
+	@Autowired
+	private IVideoManagerStorager storager;
+	
+	@GetMapping("/play/{deviceId}/{channelId}")
 	public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
 		
-		String ssrc = cmder.playStreamCmd(deviceId, channelId);
+		Device device = storager.queryVideoDevice(deviceId);
+		String ssrc = cmder.playStreamCmd(device, channelId);
 		
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId));

--
Gitblit v1.8.0