From fcb76a9ebc56575bb0d17a04e0d7c715976be6d6 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期四, 14 一月 2021 23:41:54 +0800
Subject: [PATCH] 修正初次打开通道选择列表每页数量不对的问题
---
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 5964e99..f31bd60 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.play.PlayController;
import org.slf4j.Logger;
@@ -35,7 +36,8 @@
@Autowired
private IVideoManagerStorager storager;
- private boolean closeWaitRTPInfo = false;
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Autowired
@@ -86,6 +88,8 @@
JSONObject result = new JSONObject();
result.put("error","timeout");
resultDeferredResult.setResult(result);
+
+ // 娓呯悊RTP server
});
DeviceChannel deviceChannel = storager.queryChannel(serial, code);
@@ -156,14 +160,15 @@
){
- StreamInfo streamInfo = storager.queryPlayByDevice(serial, code);
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
if (streamInfo == null) {
JSONObject result = new JSONObject();
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
}
cmder.streamByeCmd(streamInfo.getStreamId());
- storager.stopPlay(streamInfo);
+ redisCatchStorage.stopPlay(streamInfo);
+ storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
return null;
}
--
Gitblit v1.8.0