From c785f5b625aa11134c7482e333cae8f627922901 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期一, 11 五月 2020 20:24:40 +0800
Subject: [PATCH] 规范返回格式
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..9370355 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,10 @@
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;
@RestController
@RequestMapping("/api")
@@ -21,10 +24,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));
@@ -32,7 +39,9 @@
}
if(ssrc!=null) {
- return new ResponseEntity<String>(ssrc,HttpStatus.OK);
+ 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