From ca5139929b8b5853229ca3d63e2bca1ce82fa0ab Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期三, 13 五月 2020 14:55:06 +0800
Subject: [PATCH] 尝试修复catalog获取失败。服务重启后设备未注册仍上报keeplive处理
---
src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 4be6110..20078a7 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
@@ -10,6 +10,7 @@
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;
@@ -30,7 +31,7 @@
public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId, String startTime, String endTime){
Device device = storager.queryVideoDevice(deviceId);
- String ssrc = cmder.playStreamCmd(device, channelId);
+ String ssrc = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId));
@@ -38,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