搭配zgyw，实现gb28181
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
panlinlin
2021-03-30 56859d09df8d4226882d43934acf32d60a3b51d7 
 src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java


@@ -1,23 +1,19 @@


package com.genersoft.iot.vmp.vmanager.playback;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONArray;


import com.genersoft.iot.vmp.common.StreamInfo;


import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;


import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;


import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;


//import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;


import com.genersoft.iot.vmp.storager.IRedisCatchStorage;


import com.genersoft.iot.vmp.vmanager.service.IPlayService;


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.http.HttpStatus;


import org.springframework.http.ResponseEntity;


import org.springframework.util.StringUtils;


import org.springframework.web.bind.annotation.CrossOrigin;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




@@ -44,7 +40,10 @@


   private IVideoManagerStorager storager;




   @Autowired


   private ZLMRESTfulUtils zlmresTfulUtils;


   private IRedisCatchStorage redisCatchStorage;




   // @Autowired


   // private ZLMRESTfulUtils zlmresTfulUtils;




   @Autowired


   private IPlayService playService;


@@ -70,7 +69,7 @@


         resultHolder.invokeResult(msg);


      });


      Device device = storager.queryVideoDevice(deviceId);


      StreamInfo streamInfo = storager.queryPlaybackByDevice(deviceId, channelId);


      StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);


      if (streamInfo != null) {


         // 停止之前的回放


         cmder.streamByeCmd(streamInfo.getStreamId());