Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0

648540858

2022-03-04 ee746e53cda8e35ede1d966b582160caeb1ca562

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

@@ -110,26 +110,25 @@
      String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
      resultHolder.put(key, 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(uuid);
            msg.setKey(key);
            msg.setData("点播未找到");
            resultHolder.invokeAllResult(msg);
            storager.stopPlay(deviceId, channelId);
         }else {
            redisCatchStorage.stopPlay(streamInfo);
            storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
            RequestMessage msg = new RequestMessage();
            msg.setId(uuid);
            msg.setKey(key);
            //Response response = event.getResponse();
            msg.setData(String.format("success"));
            resultHolder.invokeAllResult(msg);
         }
         mediaServerService.closeRTPServer(device, channelId);
      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(), (event) -> {
         redisCatchStorage.stopPlay(streamInfo);
         storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         //Response response = event.getResponse();
         msg.setData(String.format("success"));
         resultHolder.invokeAllResult(msg);
      });

      if (deviceId != null || channelId != null) {
@@ -329,7 +328,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);
      }