Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network

648540858

2022-11-08 96bb3814f65edb36327eb02f2ea1beed30f06dfc

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

@@ -1,8 +1,10 @@
package com.genersoft.iot.vmp.vmanager.gb28181.play;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONArray;
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.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -24,8 +26,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -33,11 +33,16 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

import javax.servlet.http.HttpServlet;
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;

@@ -76,18 +81,25 @@
   @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<String> play(@PathVariable String deviceId,
                                          @PathVariable String channelId) {
   public DeferredResult<WVPResult<StreamInfo>> 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);

      playResult.getResult().onCompletion(()->{
         WVPResult<StreamInfo> result = (WVPResult<StreamInfo>)playResult.getResult().getResult();
         result.getData().channgeStreamIp(request.getLocalAddr());
         playResult.getResult().setResult(result);
      });
      return playResult.getResult();
   }

@@ -96,72 +108,44 @@
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @GetMapping("/stop/{deviceId}/{channelId}")
   public DeferredResult<String> playStop(@PathVariable String deviceId, @PathVariable String channelId) {
   public JSONObject playStop(@PathVariable String deviceId, @PathVariable String channelId) {

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

      String uuid = UUID.randomUUID().toString();
      DeferredResult<String> result = new DeferredResult<>();
      if (deviceId == null || channelId == null) {
         throw new ControllerException(ErrorCode.ERROR400);
      }

      // 录像查询以channelId作为deviceId查询
      String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
      resultHolder.put(key, uuid, result);
      Device device = storager.queryVideoDevice(deviceId);
      if (device == null) {
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "设备[" + deviceId + "]不存在");
      }

      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(String.format("success"));
         resultHolder.invokeAllResult(msgForSuccess);
      });

      if (deviceId != null || channelId != null) {
         JSONObject json = new JSONObject();
         json.put("deviceId", deviceId);
         json.put("channelId", channelId);
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(json.toString());
         resultHolder.invokeAllResult(msg);
      } else {
         logger.warn("设备预览/回放停止API调用失败！");
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData("streamId null");
         resultHolder.invokeAllResult(msg);
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "点播未找到");
      }

      // 超时处理
      result.onTimeout(()->{
         logger.warn(String.format("设备预览/回放停止超时，deviceId/channelId：%s_%s ", deviceId, channelId));
         redisCatchStorage.stopPlay(streamInfo);
         storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData("Timeout");
         resultHolder.invokeAllResult(msg);
      });
      return result;
      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());
      JSONObject json = new JSONObject();
      json.put("deviceId", deviceId);
      json.put("channelId", channelId);
      return json;

   }

   /**
    * 将不是h264的视频通过ffmpeg 转码为h264 + aac
    * @param streamId 流ID
    * @return
    */
   @Operation(summary = "将不是h264的视频通过ffmpeg 转码为h264 + aac")
   @Parameter(name = "streamId", description = "视频流ID", required = true)
@@ -205,8 +189,6 @@

   /**
    * 结束转码
    * @param key
    * @return
    */
   @Operation(summary = "结束转码")
   @Parameter(name = "key", description = "视频流key", required = true)
@@ -264,21 +246,26 @@
         resultHolder.invokeResult(msg);
         return result;
      }
      cmder.audioBroadcastCmd(device, (event) -> {
         RequestMessage msg = new RequestMessage();
         msg.setKey(key);
         msg.setId(uuid);
         JSONObject json = new JSONObject();
         json.put("DeviceID", deviceId);
         json.put("CmdType", "Broadcast");
         json.put("Result", "Failed");
         json.put("Description", String.format("语音广播操作失败，错误码： %s, %s", event.statusCode, event.msg));
         msg.setData(json);
         resultHolder.invokeResult(msg);
      });
      try {
         cmder.audioBroadcastCmd(device, (event) -> {
            RequestMessage msg = new RequestMessage();
            msg.setKey(key);
            msg.setId(uuid);
            JSONObject json = new JSONObject();
            json.put("DeviceID", deviceId);
            json.put("CmdType", "Broadcast");
            json.put("Result", "Failed");
            json.put("Description", String.format("语音广播操作失败，错误码： %s, %s", event.statusCode, event.msg));
            msg.setData(json);
            resultHolder.invokeResult(msg);
         });
      } catch (InvalidArgumentException | SipException | ParseException e) {
         logger.error("[命令发送失败] 语音广播: {}", e.getMessage());
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
      }

      result.onTimeout(() -> {
         logger.warn(String.format("语音广播操作超时, 设备未返回应答指令"));
         logger.warn("语音广播操作超时, 设备未返回应答指令");
         RequestMessage msg = new RequestMessage();
         msg.setKey(key);
         msg.setId(uuid);