guzijian / wvp-GB28181-pro · Commits

Commit 142b17cc7665c573dc3fb378e926fe0c770ee385

Authored by 648540858
1 parent 1cc111a5

更新接口

Inline Side-by-side
Showing 1 changed file with 6 additions and 7 deletions
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
  View file @142b17c
@@ -12,7 +12,6 @@ import com.genersoft.iot.vmp.service.IDeviceService; @@ -12,7 +12,6 @@ import com.genersoft.iot.vmp.service.IDeviceService;
12 import com.genersoft.iot.vmp.service.IPlayService; 12 import com.genersoft.iot.vmp.service.IPlayService;
13 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 13 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
14 import com.genersoft.iot.vmp.storager.IVideoManagerStorage; 14 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
15 -import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;  
16 import org.slf4j.Logger; 15 import org.slf4j.Logger;
17 import org.slf4j.LoggerFactory; 16 import org.slf4j.LoggerFactory;
18 import org.springframework.beans.factory.annotation.Autowired; 17 import org.springframework.beans.factory.annotation.Autowired;
@@ -120,12 +119,12 @@ public class ApiStreamController { @@ -120,12 +119,12 @@ public class ApiStreamController {
120 result.put("ChannelID", code); 119 result.put("ChannelID", code);
121 result.put("ChannelName", deviceChannel.getName()); 120 result.put("ChannelName", deviceChannel.getName());
122 result.put("ChannelCustomName", ""); 121 result.put("ChannelCustomName", "");
123 - result.put("FLV", streamInfo.getFlv());  
124 - result.put("WS_FLV", streamInfo.getWs_flv());  
125 - result.put("RTMP", streamInfo.getRtmp());  
126 - result.put("HLS", streamInfo.getHls());  
127 - result.put("RTSP", streamInfo.getRtsp());  
128 - result.put("WEBRTC", streamInfo.getRtc()); 122 + result.put("FLV", streamInfo.getFlv().getUrl());
  123 + result.put("WS_FLV", streamInfo.getWs_flv().getUrl());
  124 + result.put("RTMP", streamInfo.getRtmp().getUrl());
  125 + result.put("HLS", streamInfo.getHls().getUrl());
  126 + result.put("RTSP", streamInfo.getRtsp().getUrl());
  127 + result.put("WEBRTC", streamInfo.getRtc().getUrl());
129 result.put("CDN", ""); 128 result.put("CDN", "");
130 result.put("SnapURL", ""); 129 result.put("SnapURL", "");
131 result.put("Transport", device.getTransport()); 130 result.put("Transport", device.getTransport());