hotleave
2021-06-18 6dc8d52debd9ea20fb793ef2f814b9fb08716db8
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.vmanager.gb28181.play;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.ResourceUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -31,6 +32,7 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;
import java.io.FileNotFoundException;
import java.util.UUID;
import javax.sip.message.Response;
@@ -73,30 +75,21 @@
   public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId,
                                          @PathVariable String channelId) {
      PlayResult playResult = playService.play(deviceId, channelId, null, null);
      // 超时处理
      playResult.getResult().onTimeout(()->{
         logger.warn(String.format("设备点播超时,deviceId:%s ,channelId:%s", deviceId, channelId));
         // 释放rtpserver
         cmder.closeRTPServer(playResult.getDevice(), channelId);
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + playResult.getUuid());
         msg.setData("Timeout");
         resultHolder.invokeResult(msg);
      });
      return playResult.getResult();
   }
   @ApiOperation("停止点播")
   @ApiImplicitParams({
         @ApiImplicitParam(name = "streamId", value = "视频流ID", dataTypeClass = String.class),
         @ApiImplicitParam(name = "deviceId", value = "设备ID", dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class),
   })
   @GetMapping("/stop/{streamId}")
   public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String streamId) {
   @GetMapping("/stop/{deviceId}/{channelId}")
   public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) {
      logger.debug(String.format("设备预览/回放停止API调用,streamId:%s", streamId));
      logger.debug(String.format("设备预览/回放停止API调用,streamId:%s/$s", deviceId, channelId ));
      UUID uuid = UUID.randomUUID();
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
@@ -104,13 +97,14 @@
      // 录像查询以channelId作为deviceId查询
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_STOP + uuid, result);
      cmder.streamByeCmd(streamId, event -> {
         StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
      cmder.streamByeCmd(deviceId, channelId, event -> {
         StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
         if (streamInfo == null) {
            RequestMessage msg = new RequestMessage();
            msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
            msg.setData("streamId not found");
            msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
            msg.setData("点播未找到");
            resultHolder.invokeResult(msg);
            storager.stopPlay(deviceId, channelId);
         }else {
            redisCatchStorage.stopPlay(streamInfo);
            storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
@@ -122,9 +116,10 @@
         }
      });
      if (streamId != null) {
      if (deviceId != null || channelId != null) {
         JSONObject json = new JSONObject();
         json.put("streamId", streamId);
         json.put("deviceId", deviceId);
         json.put("channelId", channelId);
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
         msg.setData(json.toString());
@@ -139,7 +134,7 @@
      // 超时处理
      result.onTimeout(()->{
         logger.warn(String.format("设备预览/回放停止超时,streamId:%s ", streamId));
         logger.warn(String.format("设备预览/回放停止超时,deviceId/channelId:%s/$s ", deviceId, channelId));
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
         msg.setData("Timeout");
@@ -159,7 +154,7 @@
   })
   @PostMapping("/convert/{streamId}")
   public ResponseEntity<String> playConvert(@PathVariable String streamId) {
      StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
      StreamInfo streamInfo = streamId.startsWith("gb_play_") ? redisCatchStorage.queryPlayByStreamId(streamId) : redisCatchStorage.queryPlaybackByStreamId(streamId);
      if (streamInfo == null) {
         logger.warn("视频转码API调用失败!, 视频流已经停止!");
         return new ResponseEntity<String>("未找到视频流信息, 视频流可能已经停止", HttpStatus.OK);
@@ -169,19 +164,19 @@
         logger.warn("视频转码API调用失败!, 视频流已停止推流!");
         return new ResponseEntity<String>("推流信息在流媒体中不存在, 视频流可能已停止推流", HttpStatus.OK);
      } else {
         MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
         ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
         String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
               streamId );
         String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
         JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000");
         System.out.println(jsonObject);
         JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000", true, false, null);
         logger.info(jsonObject.toJSONString());
         JSONObject result = new JSONObject();
         if (jsonObject != null && jsonObject.getInteger("code") == 0) {
               result.put("code", 0);
            JSONObject data = jsonObject.getJSONObject("data");
            if (data != null) {
                  result.put("key", data.getString("key"));
               StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStream("convert", streamId);
               StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId);
               result.put("data", streamInfoResult);
            }
         }else {
@@ -205,7 +200,7 @@
   public ResponseEntity<String> playConvertStop(@PathVariable String key) {
      JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(key);
      System.out.println(jsonObject);
      logger.info(jsonObject.toJSONString());
      JSONObject result = new JSONObject();
      if (jsonObject != null && jsonObject.getInteger("code") == 0) {
         result.put("code", 0);