修复前端播放

648540858

2022-09-05 cfe9c762d680569136d0246ab61c79cd7e4eba50

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

@@ -12,6 +12,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.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
@@ -24,8 +25,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;
@@ -41,6 +40,10 @@
import java.util.List;
import java.util.UUID;


/**
 * @author lin
 */
@Tag(name  = "国标设备点播")
@CrossOrigin
@RestController
@@ -80,7 +83,7 @@
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @GetMapping("/start/{deviceId}/{channelId}")
   public DeferredResult<String> play(@PathVariable String deviceId,
   public DeferredResult<WVPResult<String>> play(@PathVariable String deviceId,
                                          @PathVariable String channelId) {

      // 获取可用的zlm
@@ -96,72 +99,33 @@
   @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);
      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;
      cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, null);
      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 +169,6 @@

   /**
    * 结束转码
    * @param key
    * @return
    */
   @Operation(summary = "结束转码")
   @Parameter(name = "key", description = "视频流key", required = true)
@@ -235,65 +197,82 @@

   @Operation(summary = "语音广播命令")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
    @GetMapping("/broadcast/{deviceId}")
    @PostMapping("/broadcast/{deviceId}")
    public DeferredResult<String> broadcastApi(@PathVariable String deviceId) {
   @Parameter(name = "deviceId", description = "通道国标编号", required = true)
   @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);
      DeferredResult<String> result = new DeferredResult<>(3 * 1000L);
      String key  = DeferredResultHolder.CALLBACK_CMD_BROADCAST + 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;
      }
      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;
      }

      String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
      if (resultHolder.exist(key, null)) {
         result.setResult("设备使用中");
         return result;
         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();
        if (device == null) {

         resultHolder.put(key, key,  result);
         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", "Device 不存在");
         msg.setData(json);
         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);
      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);
      });

      result.onTimeout(() -> {
         logger.warn(String.format("语音广播操作超时, 设备未返回应答指令"));
         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("Error", "Timeout. Device did not response to broadcast command.");
         msg.setData(json);
         resultHolder.invokeResult(msg);
      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;
   }


   @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 void stopBroadcastA(@PathVariable String deviceId, @PathVariable String channelId) {
      if (logger.isDebugEnabled()) {
         logger.debug("停止语音广播API调用");
      }
      playService.stopAudioBroadcast(deviceId, channelId);
   }

   @Operation(summary = "获取所有的ssrc")
   @GetMapping("/ssrc")
   public JSONObject getSSRC() {