添加zlm集群支持

64850858

2021-07-16 89a9ab4534f10a224f70e546db838423e84a1965

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java

@@ -4,6 +4,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
//import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.service.IPlayService;
import io.swagger.annotations.Api;
@@ -71,7 +73,7 @@
         logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId));
      }
      UUID uuid = UUID.randomUUID();
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(30000L);
      // 超时处理
      result.onTimeout(()->{
         logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId));
@@ -84,12 +86,21 @@
      StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
      if (streamInfo != null) {
         // 停止之前的回放
         cmder.streamByeCmd(streamInfo.getStreamId());
         cmder.streamByeCmd(deviceId, channelId);
      }
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
      cmder.playbackStreamCmd(device, channelId, startTime, endTime, (JSONObject response) -> {
      IMediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
      if (newMediaServerItem == null) {
         logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId));
         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
         msg.setData("Timeout");
         resultHolder.invokeResult(msg);
         return result;
      }
      cmder.playbackStreamCmd(newMediaServerItem, device, channelId, startTime, endTime, (IMediaServerItem mediaServerItem, JSONObject response) -> {
         logger.info("收到订阅消息： " + response.toJSONString());
         playService.onPublishHandlerForPlayBack(response, deviceId, channelId, uuid.toString());
         playService.onPublishHandlerForPlayBack(mediaServerItem, response, deviceId, channelId, uuid.toString());
      }, event -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
@@ -103,20 +114,22 @@

   @ApiOperation("停止视频回放")
   @ApiImplicitParams({
         @ApiImplicitParam(name = "ssrc", value = "视频流标识", dataTypeClass = String.class),
         @ApiImplicitParam(name = "deviceId", value = "设备ID", dataTypeClass = String.class),
         @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class),
   })
   @GetMapping("/stop/{ssrc}")
   public ResponseEntity<String> playStop(@PathVariable String ssrc) {
   @GetMapping("/stop/{deviceId}/{channelId}")
   public ResponseEntity<String> playStop(@PathVariable String deviceId, @PathVariable String channelId) {

      cmder.streamByeCmd(ssrc);
      cmder.streamByeCmd(deviceId, channelId);

      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备录像回放停止 API调用，ssrc：%s", ssrc));
         logger.debug(String.format("设备录像回放停止 API调用，deviceId/channelId：%s/%s", deviceId, channelId));
      }

      if (ssrc != null) {
      if (deviceId != null && channelId != null) {
         JSONObject json = new JSONObject();
         json.put("ssrc", ssrc);
         json.put("deviceId", deviceId);
         json.put("channelId", channelId);
         return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
      } else {
         logger.warn("设备录像回放停止API调用失败！");