合并开源主线

648540858

2023-04-04 b4048fbe80dba8e7756ae557a15ab60b4f80a44b

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -1,42 +1,38 @@
package com.genersoft.iot.vmp.vmanager.gb28181.play;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
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;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.vmanager.bean.AudioBroadcastResult;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.service.IPlayService;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.bean.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
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;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;

import javax.servlet.http.HttpServletRequest;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import java.text.ParseException;
import java.util.List;
import java.util.UUID;

@@ -45,7 +41,7 @@
 * @author lin
 */
@Tag(name  = "国标设备点播")
@CrossOrigin

@RestController
@RequestMapping("/api/play")
public class PlayController {
@@ -79,21 +75,63 @@
   @Autowired
   private IMediaServerService mediaServerService;

   @Autowired
   private UserSetting userSetting;

   @Operation(summary = "开始点播")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @GetMapping("/start/{deviceId}/{channelId}")
   public DeferredResult<WVPResult<String>> play(@PathVariable String deviceId,
                                          @PathVariable String channelId) {
   public DeferredResult<WVPResult<StreamContent>> play(HttpServletRequest request, @PathVariable String deviceId,
                                           @PathVariable String channelId) {

      // 获取可用的zlm
      Device device = storager.queryVideoDevice(deviceId);
      MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
      PlayResult playResult = playService.play(newMediaServerItem, deviceId, channelId, null, null, null);

      return playResult.getResult();
      RequestMessage msg = new RequestMessage();
      String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
      boolean exist = resultHolder.exist(key, null);
      msg.setKey(key);
      String uuid = UUID.randomUUID().toString();
      msg.setId(uuid);
      DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
      DeferredResultEx<WVPResult<StreamContent>> deferredResultEx = new DeferredResultEx<>(result);

      result.onTimeout(()->{
         logger.info("点播接口等待超时");
         // 释放rtpserver
         WVPResult<StreamInfo> wvpResult = new WVPResult<>();
         wvpResult.setCode(ErrorCode.ERROR100.getCode());
         wvpResult.setMsg("点播超时");
         msg.setData(wvpResult);
         resultHolder.invokeResult(msg);
      });
      // TODO 在点播未成功的情况下在此调用接口点播会导致返回的流地址ip错误
      deferredResultEx.setFilter(result1 -> {
         WVPResult<StreamInfo> wvpResult1 = (WVPResult<StreamInfo>)result1;
         WVPResult<StreamContent> resultStream = new WVPResult<>();
         resultStream.setCode(wvpResult1.getCode());
         resultStream.setMsg(wvpResult1.getMsg());
         if (wvpResult1.getCode() == ErrorCode.SUCCESS.getCode()) {
            StreamInfo data = wvpResult1.getData().clone();
            if (userSetting.getUseSourceIpAsStreamIp()) {
               data.channgeStreamIp(request.getLocalName());
            }
            resultStream.setData(new StreamContent(wvpResult1.getData()));
         }
         return resultStream;
      });


      // 录像查询以channelId作为deviceId查询
      resultHolder.put(key, uuid, deferredResultEx);

      if (!exist) {
         playService.play(newMediaServerItem, deviceId, channelId, null, null, null);
      }
      return result;
   }


   @Operation(summary = "停止点播")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
@@ -107,12 +145,23 @@
         throw new ControllerException(ErrorCode.ERROR400);
      }

      Device device = storager.queryVideoDevice(deviceId);
      if (device == null) {
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "设备[" + deviceId + "]不存在");
      }

      StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
      if (streamInfo == null) {
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "点播未找到");
      }

      cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, null);
      try {
         logger.warn("[停止点播] {}/{}", device.getDeviceId(), channelId);
         cmder.streamByeCmd(device, channelId, streamInfo.getStream(), null, null);
      } catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
         logger.error("[命令发送失败] 停止点播， 发送BYE: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      }
      redisCatchStorage.stopPlay(streamInfo);

      storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
@@ -120,7 +169,6 @@
      json.put("deviceId", deviceId);
      json.put("channelId", channelId);
      return json;

   }

   /**
@@ -201,77 +249,38 @@
   @Parameter(name = "timeout", description = "推流超时时间(秒)", required = true)
   @GetMapping("/broadcast/{deviceId}/{channelId}")
   @PostMapping("/broadcast/{deviceId}/{channelId}")
    public DeferredResult<WVPResult<AudioBroadcastResult>> broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout) {
        if (logger.isDebugEnabled()) {
            logger.debug("语音广播API调用");
        }
        Device device = storager.queryVideoDevice(deviceId);
    public AudioBroadcastResult broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout, Boolean broadcastMode) {
      if (logger.isDebugEnabled()) {
         logger.debug("语音广播API调用");
      }
      Device device = storager.queryVideoDevice(deviceId);
      if (device == null) {
         WVPResult<AudioBroadcastResult> result = new WVPResult<>();
         result.setCode(-1);
         result.setMsg("未找到设备： " + deviceId);
         DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
         deferredResult.setResult(result);
         return deferredResult;
         throw new ControllerException(ErrorCode.ERROR400.getCode(), "未找到设备： " + deviceId);
      }
      if (channelId == null) {
         WVPResult<AudioBroadcastResult> result = new WVPResult<>();
         result.setCode(-1);
         result.setMsg("未找到通道： " + channelId);
         DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
         deferredResult.setResult(result);
         return deferredResult;
         throw new ControllerException(ErrorCode.ERROR400.getCode(), "未找到通道： " + channelId);
      }

      String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
      if (resultHolder.exist(key, null)) {
         WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
         wvpResult.setCode(-1);
         wvpResult.setMsg("设备使用中");
         DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
         deferredResult.setResult(wvpResult);
         return deferredResult;
      }
      if (timeout == null){
         timeout = 30;
      }
      DeferredResult<WVPResult<AudioBroadcastResult>> result = new DeferredResult<>(timeout.longValue()*1000 + 2000);
      String uuid  = UUID.randomUUID().toString();
      result.onTimeout(()->{
         WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
         wvpResult.setCode(-1);
         wvpResult.setMsg("请求超时");
         RequestMessage requestMessage = new RequestMessage();
         requestMessage.setKey(key);
         requestMessage.setData(wvpResult);
         resultHolder.invokeAllResult(requestMessage);
      });
      playService.audioBroadcast(device, channelId, timeout, (msg)->{
         WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
         wvpResult.setCode(-1);
         wvpResult.setMsg(msg);
         RequestMessage requestMessage = new RequestMessage();
         requestMessage.setKey(key);
         requestMessage.setData(wvpResult);
         resultHolder.invokeAllResult(requestMessage);
      });
      resultHolder.put(key, uuid, result);
      return playService.audioBroadcast(device, channelId, broadcastMode);

      return result;
   }


   @Operation(summary = "停止语音广播")
   @Parameter(name = "deviceId", description = "设备Id", required = true)
   @Parameter(name = "channelId", description = "通道Id", required = true)
   @GetMapping("/broadcast/stop/{deviceId}/{channelId}")
   @PostMapping("/broadcast/stop/{deviceId}/{channelId}")
   public WVPResult<String> stopBroadcastA(@PathVariable String deviceId, @PathVariable String channelId) {
   public void stopBroadcast(@PathVariable String deviceId, @PathVariable String channelId) {
      if (logger.isDebugEnabled()) {
         logger.debug("停止语音广播API调用");
      }
//      try {
//         playService.stopAudioBroadcast(deviceId, channelId);
//      } catch (InvalidArgumentException | ParseException  | SipException e) {
//         logger.error("[命令发送失败] 停止语音: {}", e.getMessage());
//         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " +  e.getMessage());
//      }
      playService.stopAudioBroadcast(deviceId, channelId);
      return new WVPResult<>(0, "success", null);
   }

   @Operation(summary = "获取所有的ssrc")