From d4ae8194eb87271423aba24bab0f0d815d5ffdc1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 13 十月 2020 14:46:47 +0800
Subject: [PATCH] 离在线状态样式修改 修复未回复200ok导致catalog一直发送的bug 修改点播接口未收到视频后回复
---
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
index d2644f3..8d845b1 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -70,7 +70,7 @@
return result;
}
// 鏌ヨ鏄惁宸茬粡鍦ㄦ挱鏀�
- StreamInfo streamInfo = storager.queryPlay(device.getDeviceId(), code);
+ StreamInfo streamInfo = storager.queryPlayByDevice(device.getDeviceId(), code);
if (streamInfo == null) streamInfo = cmder.playStreamCmd(device, code);
if (logger.isDebugEnabled()) {
@@ -86,10 +86,10 @@
result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName ", "");
result.put("FLV ", streamInfo.getFlv());
- result.put("WS_FLV ", streamInfo.getWS_FLV());
- result.put("RTMP", streamInfo.getRTMP());
- result.put("HLS", streamInfo.getHLS());
- result.put("RTSP", streamInfo.getRTSP());
+ result.put("WS_FLV ", streamInfo.getWs_flv());
+ result.put("RTMP", streamInfo.getRtmp());
+ result.put("HLS", streamInfo.getHls());
+ result.put("RTSP", streamInfo.getRtsp());
result.put("CDN", "");
result.put("SnapURL", "");
result.put("Transport", device.getTransport());
@@ -135,14 +135,14 @@
@RequestParam(required = false)String check_outputs
){
- StreamInfo streamInfo = storager.queryPlay(serial, code);
+ StreamInfo streamInfo = storager.queryPlayByDevice(serial, code);
if (streamInfo == null) {
JSONObject result = new JSONObject();
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
}
cmder.streamByeCmd(streamInfo.getSsrc());
- storager.stopPlay(serial, code);
+ storager.stopPlay(streamInfo);
return null;
}
@@ -151,7 +151,6 @@
* @param serial 璁惧缂栧彿
* @param channel 閫氶亾搴忓彿
* @param code 閫氶亾鍥芥爣缂栧彿
- * @param check_outputs
* @return
*/
@RequestMapping(value = "/touch")
--
Gitblit v1.8.0