合并主线

648540858

2022-11-18 ecf84bb0f1952c4a044ff6c8aa18226b31593f3f

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

@@ -111,6 +111,7 @@
         resultHolder.invokeResult(msg);
      });

      if (userSetting.isUsePushingAsStatus()) {
      // TODO 在点播未成功的情况下在此调用接口点播会导致返回的流地址ip错误
      deferredResultEx.setFilter(result1 -> {
         WVPResult<StreamInfo> wvpResult1 = (WVPResult<StreamInfo>)result1;
@@ -127,6 +128,8 @@
         }
         return clone;
      });
      }


      // 录像查询以channelId作为deviceId查询
      resultHolder.put(key, uuid, deferredResultEx);