修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致

fine

2024-01-09 db493e262566c2ed2ac046e6f610b2da6cf61682

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java

old mode 100644
new mode 100755
@@ -1,15 +1,22 @@
package com.genersoft.iot.vmp.vmanager.gb28181.record;

import com.genersoft.iot.vmp.common.InviteInfo;
import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
@@ -17,16 +24,19 @@
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;

import javax.servlet.http.HttpServletRequest;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import java.text.ParseException;
@@ -53,12 +63,15 @@
   private IPlayService playService;

   @Autowired
   private IInviteStreamService inviteStreamService;

   @Autowired
   private IDeviceService deviceService;

   @Autowired
   private UserSetting userSetting;



   @Operation(summary = "录像查询")
   @Operation(summary = "录像查询", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "startTime", description = "开始时间", required = true)
@@ -112,15 +125,15 @@
   }


   @Operation(summary = "开始历史媒体下载")
   @Operation(summary = "开始历史媒体下载", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "startTime", description = "开始时间", required = true)
   @Parameter(name = "endTime", description = "结束时间", required = true)
   @Parameter(name = "downloadSpeed", description = "下载倍速", required = true)
   @GetMapping("/download/start/{deviceId}/{channelId}")
   public DeferredResult<WVPResult<StreamContent>> download(@PathVariable String deviceId, @PathVariable String channelId,
                                          String startTime, String endTime, String downloadSpeed) {
   public DeferredResult<WVPResult<StreamContent>> download(HttpServletRequest request, @PathVariable String deviceId, @PathVariable String channelId,
                                              String startTime, String endTime, String downloadSpeed) {

      if (logger.isDebugEnabled()) {
         logger.debug(String.format("历史媒体下载 API调用，deviceId：%s，channelId：%s，downloadSpeed：%s", deviceId, channelId, downloadSpeed));
@@ -130,28 +143,38 @@
      String key = DeferredResultHolder.CALLBACK_CMD_DOWNLOAD + deviceId + channelId;
      DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(30000L);
      resultHolder.put(key, uuid, result);
      RequestMessage msg = new RequestMessage();
      msg.setId(uuid);
      msg.setKey(key);
      RequestMessage requestMessage = new RequestMessage();
      requestMessage.setId(uuid);
      requestMessage.setKey(key);

      WVPResult<StreamContent> wvpResult = new WVPResult<>();

      playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed), null, playBackResult->{
      playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed),
      (code, msg, data)->{

         wvpResult.setCode(playBackResult.getCode());
         wvpResult.setMsg(playBackResult.getMsg());
         if (playBackResult.getCode() == ErrorCode.SUCCESS.getCode()) {
            StreamInfo streamInfo = (StreamInfo)playBackResult.getData();
            wvpResult.setData(new StreamContent(streamInfo));
         WVPResult<StreamContent> wvpResult = new WVPResult<>();
         if (code == InviteErrorCode.SUCCESS.getCode()) {
            wvpResult.setCode(ErrorCode.SUCCESS.getCode());
            wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());

            if (data != null) {
               StreamInfo streamInfo = (StreamInfo)data;
               if (userSetting.getUseSourceIpAsStreamIp()) {
                  streamInfo.channgeStreamIp(request.getLocalAddr());
               }
               wvpResult.setData(new StreamContent(streamInfo));
            }
         }else {
            wvpResult.setCode(code);
            wvpResult.setMsg(msg);
         }
         msg.setData(wvpResult);
         resultHolder.invokeResult(msg);
         requestMessage.setData(wvpResult);
         resultHolder.invokeResult(requestMessage);
      });

      return result;
   }

   @Operation(summary = "停止历史媒体下载")
   @Operation(summary = "停止历史媒体下载", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "stream", description = "流ID", required = true)
@@ -179,7 +202,7 @@
      }
   }

   @Operation(summary = "获取历史媒体下载进度")
   @Operation(summary = "获取历史媒体下载进度", security = @SecurityRequirement(name = JwtUtils.HEADER))
   @Parameter(name = "deviceId", description = "设备国标编号", required = true)
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "stream", description = "流ID", required = true)