Merge branch 'wvp-28181-2.0' into Zafu-Dev-1127

648540858

2022-11-29 ef6693aabbbf12e83d09ad8749f6e60faacc012d

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

@@ -106,22 +106,24 @@
         resultHolder.invokeResult(msg);
      });

      // TODO 在点播未成功的情况下在此调用接口点播会导致返回的流地址ip错误
      deferredResultEx.setFilter(result1 -> {
         WVPResult<StreamInfo> wvpResult1 = (WVPResult<StreamInfo>)result1;
         WVPResult<StreamInfo> clone = null;
         try {
            clone = (WVPResult<StreamInfo>)wvpResult1.clone();
         } catch (CloneNotSupportedException e) {
            throw new RuntimeException(e);
         }
         if (clone.getCode() == ErrorCode.SUCCESS.getCode()) {
            StreamInfo data = clone.getData().clone();
            data.channgeStreamIp(request.getLocalName());
            clone.setData(data);
         }
         return clone;
      });
      if (userSetting.getUseSourceIpAsStreamIp()) {
         // TODO 在点播未成功的情况下在此调用接口点播会导致返回的流地址ip错误
         deferredResultEx.setFilter(result1 -> {
            WVPResult<StreamInfo> wvpResult1 = (WVPResult<StreamInfo>)result1;
            WVPResult<StreamInfo> clone = null;
            try {
               clone = (WVPResult<StreamInfo>)wvpResult1.clone();
            } catch (CloneNotSupportedException e) {
               throw new RuntimeException(e);
            }
            if (clone.getCode() == ErrorCode.SUCCESS.getCode()) {
               StreamInfo data = clone.getData().clone();
               data.channgeStreamIp(request.getLocalName());
               clone.setData(data);
            }
            return clone;
         });
      }

      // 录像查询以channelId作为deviceId查询
      resultHolder.put(key, uuid, deferredResultEx);
@@ -131,7 +133,6 @@
      }
      return result;
   }


   @Operation(summary = "停止点播")
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
@@ -169,7 +170,6 @@
      json.put("deviceId", deviceId);
      json.put("channelId", channelId);
      return json;

   }

   /**