优化sip消息

648540858

2022-09-09 221f99c764b51c3cd284c6e5a41492c26c5c7ffc

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

@@ -2,10 +2,12 @@

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.gb28181.transmit.callback.RequestMessage;
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.WVPResult;

import io.swagger.v3.oas.annotations.Operation;
@@ -58,28 +60,17 @@
   @Parameter(name = "startTime", description = "开始时间", required = true)
   @Parameter(name = "endTime", description = "结束时间", required = true)
   @GetMapping("/query/{deviceId}/{channelId}")
   public DeferredResult<ResponseEntity<WVPResult<RecordInfo>>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){
   public DeferredResult<WVPResult<RecordInfo>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){

      if (logger.isDebugEnabled()) {
         logger.debug(String.format("录像信息查询 API调用，deviceId：%s ，startTime：%s， endTime：%s",deviceId, startTime, endTime));
      }
      DeferredResult<ResponseEntity<WVPResult<RecordInfo>>> result = new DeferredResult<>();
      DeferredResult<WVPResult<RecordInfo>> result = new DeferredResult<>();
      if (!DateUtil.verification(startTime, DateUtil.formatter)){
         WVPResult<RecordInfo> wvpResult = new WVPResult<>();
         wvpResult.setCode(-1);
         wvpResult.setMsg("startTime error, format is " + DateUtil.PATTERN);

         ResponseEntity<WVPResult<RecordInfo>> resultResponseEntity = new ResponseEntity<>(wvpResult, HttpStatus.OK);
         result.setResult(resultResponseEntity);
         return result;
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "startTime error, format is " + DateUtil.PATTERN);
      }
      if (!DateUtil.verification(endTime, DateUtil.formatter)){
         WVPResult<RecordInfo> wvpResult = new WVPResult<>();
         wvpResult.setCode(-1);
         wvpResult.setMsg("endTime error, format is " + DateUtil.PATTERN);
         ResponseEntity<WVPResult<RecordInfo>> resultResponseEntity = new ResponseEntity<>(wvpResult, HttpStatus.OK);
         result.setResult(resultResponseEntity);
         return result;
         throw new ControllerException(ErrorCode.ERROR100.getCode(), "endTime error, format is " + DateUtil.PATTERN);
      }

      Device device = storager.queryVideoDevice(deviceId);
@@ -92,7 +83,7 @@
      msg.setKey(key);
      cmder.recordInfoQuery(device, channelId, startTime, endTime, sn, null, null, null, (eventResult -> {
         WVPResult<RecordInfo> wvpResult = new WVPResult<>();
         wvpResult.setCode(-1);
         wvpResult.setCode(ErrorCode.ERROR100.getCode());
         wvpResult.setMsg("查询录像失败, status: " +  eventResult.statusCode + ", message: " + eventResult.msg);
         msg.setData(wvpResult);
         resultHolder.invokeResult(msg);
@@ -103,7 +94,7 @@
      result.onTimeout(()->{
         msg.setData("timeout");
         WVPResult<RecordInfo> wvpResult = new WVPResult<>();
         wvpResult.setCode(-1);
         wvpResult.setCode(ErrorCode.ERROR100.getCode());
         wvpResult.setMsg("timeout");
         msg.setData(wvpResult);
         resultHolder.invokeResult(msg);
@@ -119,59 +110,14 @@
   @Parameter(name = "endTime", description = "结束时间", required = true)
   @Parameter(name = "downloadSpeed", description = "下载倍速", required = true)
   @GetMapping("/download/start/{deviceId}/{channelId}")
   public DeferredResult<ResponseEntity<String>> download(@PathVariable String deviceId, @PathVariable String channelId,
   public DeferredResult<WVPResult<StreamInfo>> 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));
      }
//      String key = DeferredResultHolder.CALLBACK_CMD_DOWNLOAD + deviceId + channelId;
//      String uuid = UUID.randomUUID().toString();
//      DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(30000L);
//      // 超时处理
//      result.onTimeout(()->{
//         logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%s", deviceId, channelId));
//         RequestMessage msg = new RequestMessage();
//         msg.setId(uuid);
//         msg.setKey(key);
//         msg.setData("Timeout");
//         resultHolder.invokeAllResult(msg);
//      });
//      if(resultHolder.exist(key, null)) {
//         return result;
//      }
//      resultHolder.put(key, uuid, result);
//      Device device = storager.queryVideoDevice(deviceId);
//
//      MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
//      if (newMediaServerItem == null) {
//         logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%s", deviceId, channelId));
//         RequestMessage msg = new RequestMessage();
//         msg.setId(uuid);
//         msg.setKey(key);
//         msg.setData("Timeout");
//         resultHolder.invokeAllResult(msg);
//         return result;
//      }
//
//      SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, true);
//
//      cmder.downloadStreamCmd(newMediaServerItem, ssrcInfo, device, channelId, startTime, endTime, downloadSpeed, (InviteStreamInfo inviteStreamInfo) -> {
//         logger.info("收到订阅消息： " + inviteStreamInfo.getResponse().toJSONString());
//         playService.onPublishHandlerForDownload(inviteStreamInfo, deviceId, channelId, uuid);
//      }, event -> {
//         RequestMessage msg = new RequestMessage();
//         msg.setId(uuid);
//         msg.setKey(key);
//         msg.setData(String.format("回放失败， 错误码： %s, %s", event.statusCode, event.msg));
//         resultHolder.invokeAllResult(msg);
//      });

      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId));
      }

      DeferredResult<ResponseEntity<String>> result = playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed), null, hookCallBack->{
      DeferredResult<WVPResult<StreamInfo>> result = playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed), null, hookCallBack->{
         resultHolder.invokeResult(hookCallBack.getData());
      });

@@ -183,7 +129,7 @@
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "stream", description = "流ID", required = true)
   @GetMapping("/download/stop/{deviceId}/{channelId}/{stream}")
   public ResponseEntity<String> playStop(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
   public void playStop(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {

      cmder.streamByeCmd(deviceId, channelId, stream, null);

@@ -191,14 +137,8 @@
         logger.debug(String.format("设备历史媒体下载停止 API调用，deviceId/channelId：%s_%s", deviceId, channelId));
      }

      if (deviceId != null && channelId != null) {
         JSONObject json = new JSONObject();
         json.put("deviceId", deviceId);
         json.put("channelId", channelId);
         return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
      } else {
         logger.warn("设备历史媒体下载停止API调用失败！");
         return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
      if (deviceId == null || channelId == null) {
         throw new ControllerException(ErrorCode.ERROR100);
      }
   }

@@ -207,9 +147,7 @@
   @Parameter(name = "channelId", description = "通道国标编号", required = true)
   @Parameter(name = "stream", description = "流ID", required = true)
   @GetMapping("/download/progress/{deviceId}/{channelId}/{stream}")
   public ResponseEntity<StreamInfo> getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {

      StreamInfo streamInfo = playService.getDownLoadInfo(deviceId, channelId, stream);
      return new ResponseEntity<>(streamInfo, HttpStatus.OK);
   public StreamInfo getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
      return playService.getDownLoadInfo(deviceId, channelId, stream);
   }
}