更新README

648540858

2023-01-12 e2944938cddbe41af0bd65fb3cb2c2459c55a134

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

@@ -1,15 +1,14 @@
package com.genersoft.iot.vmp.vmanager.gb28181.record;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;

import io.swagger.v3.oas.annotations.Operation;
@@ -18,8 +17,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -36,7 +33,6 @@
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import java.text.ParseException;
import java.time.LocalDate;
import java.util.UUID;

@Tag(name  = "国标录像")
@@ -126,15 +122,33 @@
   @Parameter(name = "endTime", description = "结束时间", required = true)
   @Parameter(name = "downloadSpeed", description = "下载倍速", required = true)
   @GetMapping("/download/start/{deviceId}/{channelId}")
   public DeferredResult<WVPResult<StreamInfo>> download(@PathVariable String deviceId, @PathVariable String channelId,
   public DeferredResult<WVPResult<StreamContent>> download(@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));
      }

      DeferredResult<WVPResult<StreamInfo>> result = playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed), null, hookCallBack->{
         resultHolder.invokeResult(hookCallBack.getData());
      String uuid = UUID.randomUUID().toString();
      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);

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

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

         wvpResult.setCode(playBackResult.getCode());
         wvpResult.setMsg(playBackResult.getMsg());
         if (playBackResult.getCode() == ErrorCode.SUCCESS.getCode()) {
            StreamInfo streamInfo = (StreamInfo)playBackResult.getData();
            wvpResult.setData(new StreamContent(streamInfo));
         }
         msg.setData(wvpResult);
         resultHolder.invokeResult(msg);
      });

      return result;
@@ -155,7 +169,7 @@
         throw new ControllerException(ErrorCode.ERROR400);
      }

      Device device = deviceService.queryDevice(deviceId);
      Device device = deviceService.getDevice(deviceId);
      if (device == null) {
         throw new ControllerException(ErrorCode.ERROR400.getCode(), "设备：" + deviceId + "未找到");
      }
@@ -173,7 +187,11 @@
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "stream", description = "流ID", required = true)
   @GetMapping("/download/progress/{deviceId}/{channelId}/{stream}")
   public StreamInfo getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
      return playService.getDownLoadInfo(deviceId, channelId, stream);
   public StreamContent getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
      StreamInfo downLoadInfo = playService.getDownLoadInfo(deviceId, channelId, stream);
      if (downLoadInfo == null) {
         throw new ControllerException(ErrorCode.ERROR404);
      }
      return new StreamContent(downLoadInfo);
   }
}