648540858
2020-12-14 3d2aeb890b0d6bc13ea44ff6e0d5764bcf7aa529
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -64,6 +64,7 @@
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
      // 超时处理
      result.onTimeout(()->{
         logger.warn(String.format("设备点播超时,deviceId:%s ,channelId:%s", deviceId, channelId));
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
         msg.setData("Timeout");
@@ -73,7 +74,7 @@
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
      if (streamInfo == null) {
         // TODO playStreamCmd 超时处理
         // 发送点播消息
         cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
            logger.info("收到订阅消息: " + response.toJSONString());
            playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
@@ -141,7 +142,8 @@
         MediaServerConfig mediaInfo = storager.getMediaInfo();
         String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
               streamId );
         JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(streamInfo.getRtsp(), dstUrl, "1000000");
         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 result = new JSONObject();
         if (jsonObject != null && jsonObject.getInteger("code") == 0) {