Merge remote-tracking branch 'origin/rtc' into commercial

648540858

2022-06-27 038d360dd4f2dd3c06f5d97dc66ed13fd78de212

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

@@ -11,6 +11,7 @@
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.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import com.genersoft.iot.vmp.service.IMediaService;
@@ -33,14 +34,15 @@

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

import java.util.List;
import java.util.UUID;

import javax.sip.message.Response;

/**
 * @author lin
 */
@Api(tags = "国标设备点播")
@CrossOrigin
@RestController
@@ -56,7 +58,7 @@
   private VideoStreamSessionManager streamSession;

   @Autowired
   private IVideoManagerStorager storager;
   private IVideoManagerStorage storager;

   @Autowired
   private IRedisCatchStorage redisCatchStorage;
@@ -88,7 +90,7 @@
      // 获取可用的zlm
      Device device = storager.queryVideoDevice(deviceId);
      MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
      PlayResult playResult = playService.play(newMediaServerItem, deviceId, channelId, null, null);
      PlayResult playResult = playService.play(newMediaServerItem, deviceId, channelId, null, null, null);

      return playResult.getResult();
   }
@@ -101,32 +103,32 @@
   @GetMapping("/stop/{deviceId}/{channelId}")
   public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) {

      logger.debug(String.format("设备预览/回放停止API调用，streamId：%s/$s", deviceId, channelId ));
      logger.debug(String.format("设备预览/回放停止API调用，streamId：%s_%s", deviceId, channelId ));

      UUID uuid = UUID.randomUUID();
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
      String uuid = UUID.randomUUID().toString();
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<>();

      // 录像查询以channelId作为deviceId查询
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_STOP + uuid, result);
      Device device = storager.queryVideoDevice(deviceId);
      cmder.streamByeCmd(deviceId, channelId, (event) -> {
         StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
         if (streamInfo == null) {
            RequestMessage msg = new RequestMessage();
            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());
            RequestMessage msg = new RequestMessage();
            msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
            //Response response = event.getResponse();
            msg.setData(String.format("success"));
            resultHolder.invokeResult(msg);
         }
         mediaServerService.closeRTPServer(device, channelId);
      String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
      resultHolder.put(key, uuid, result);
      StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
      if (streamInfo == null) {
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData("点播未找到");
         resultHolder.invokeAllResult(msg);
         storager.stopPlay(deviceId, channelId);
         return result;
      }
      cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, eventResult -> {
         redisCatchStorage.stopPlay(streamInfo);
         storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
         RequestMessage msgForSuccess = new RequestMessage();
         msgForSuccess.setId(uuid);
         msgForSuccess.setKey(key);
         msgForSuccess.setData("success");
         resultHolder.invokeAllResult(msgForSuccess);
      });

      if (deviceId != null || channelId != null) {
@@ -134,24 +136,27 @@
         json.put("deviceId", deviceId);
         json.put("channelId", channelId);
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(json.toString());
         resultHolder.invokeResult(msg);
         resultHolder.invokeAllResult(msg);
      } else {
         logger.warn("设备预览/回放停止API调用失败！");
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData("streamId null");
         resultHolder.invokeResult(msg);
         resultHolder.invokeAllResult(msg);
      }

      // 超时处理
      result.onTimeout(()->{
         logger.warn(String.format("设备预览/回放停止超时，deviceId/channelId：%s/$s ", deviceId, channelId));
         logger.warn(String.format("设备预览/回放停止超时，deviceId/channelId：%s_%s ", deviceId, channelId));
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData("Timeout");
         resultHolder.invokeResult(msg);
         resultHolder.invokeAllResult(msg);
      });
      return result;
   }
@@ -169,7 +174,7 @@
   public ResponseEntity<String> playConvert(@PathVariable String streamId) {
      StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
      if (streamInfo == null) {
         streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
         streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
      }
      if (streamInfo == null) {
         logger.warn("视频转码API调用失败！, 视频流已经停止!");
@@ -250,60 +255,89 @@
   @ApiOperation("语音广播命令")
   @ApiImplicitParams({
         @ApiImplicitParam(name = "deviceId", value = "设备Id", dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value = "通道Id", dataTypeClass = String.class),
         @ApiImplicitParam(name = "timeout", value = "推流超时时间(秒)", dataTypeClass = Integer.class),
   })
    @GetMapping("/broadcast/{deviceId}")
    @PostMapping("/broadcast/{deviceId}")
    public DeferredResult<ResponseEntity<String>> broadcastApi(@PathVariable String deviceId) {
    @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);
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
        if (device == null) {
         resultHolder.put(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId, result);
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
         JSONObject json = new JSONObject();
         json.put("DeviceID", deviceId);
         json.put("CmdType", "Broadcast");
         json.put("Result", "Failed");
         json.put("Description", "Device 不存在");
         msg.setData(json);
         resultHolder.invokeResult(msg);
         return result;
      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;
      }
      cmder.audioBroadcastCmd(device, (event) -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
         JSONObject json = new JSONObject();
         json.put("DeviceID", deviceId);
         json.put("CmdType", "Broadcast");
         json.put("Result", "Failed");
         json.put("Description", String.format("语音广播操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(json);
         resultHolder.invokeResult(msg);
      });
      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;
      }

      result.onTimeout(() -> {
         logger.warn(String.format("语音广播操作超时, 设备未返回应答指令"));
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
         JSONObject json = new JSONObject();
         json.put("DeviceID", deviceId);
         json.put("CmdType", "Broadcast");
         json.put("Result", "Failed");
         json.put("Error", "Timeout. Device did not response to broadcast command.");
         msg.setData(json);
         resultHolder.invokeResult(msg);
      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);
      });
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId, result);
      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 result;
   }


   @ApiOperation("停止语音广播")
   @ApiImplicitParams({
         @ApiImplicitParam(name = "deviceId", value = "设备Id", dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value = "通道Id", dataTypeClass = String.class),
   })
   @GetMapping("/broadcast/stop/{deviceId}/{channelId}")
   @PostMapping("/broadcast/stop/{deviceId}/{channelId}")
   public WVPResult<String> stopBroadcastA(@PathVariable String deviceId, @PathVariable String channelId) {
      if (logger.isDebugEnabled()) {
         logger.debug("停止语音广播API调用");
      }
      playService.stopAudioBroadcast(deviceId, channelId);
      return new WVPResult<>(0, "success", null);
   }

   @ApiOperation("获取所有的ssrc")
   @GetMapping("/ssrc")
   public WVPResult<JSONObject> getSSRC() {
   public WVPResult<JSONObject> getSsrc() {
      if (logger.isDebugEnabled()) {
         logger.debug("获取所有的ssrc");
      }
@@ -314,7 +348,7 @@
         jsonObject.put("deviceId", transaction.getDeviceId());
         jsonObject.put("channelId", transaction.getChannelId());
         jsonObject.put("ssrc", transaction.getSsrc());
         jsonObject.put("streamId", transaction.getStreamId());
         jsonObject.put("streamId", transaction.getStream());
         objects.add(jsonObject);
      }