From c25a99d60bef3d3bbd59fee895bd658928fd00db Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 10 一月 2024 16:17:29 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java | 78 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
old mode 100644
new mode 100755
index b09467a..910e436
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -1,46 +1,42 @@
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.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+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.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
+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;
+import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
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.tags.Tag;
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;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;
-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.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-
+import javax.servlet.http.HttpServletRequest;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import java.text.ParseException;
-import java.time.LocalDate;
import java.util.UUID;
@Tag(name = "鍥芥爣褰曞儚")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/gb_record")
public class GBRecordController {
@@ -62,8 +58,8 @@
@Autowired
private IDeviceService deviceService;
-
-
+ @Autowired
+ private UserSetting userSetting;
@Operation(summary = "褰曞儚鏌ヨ")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@@ -78,10 +74,10 @@
}
DeferredResult<WVPResult<RecordInfo>> result = new DeferredResult<>();
if (!DateUtil.verification(startTime, DateUtil.formatter)){
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "startTime error, format is " + DateUtil.PATTERN);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "startTime鏍煎紡涓�" + DateUtil.PATTERN);
}
if (!DateUtil.verification(endTime, DateUtil.formatter)){
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "endTime error, format is " + DateUtil.PATTERN);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "endTime鏍煎紡涓�" + DateUtil.PATTERN);
}
Device device = storager.queryVideoDevice(deviceId);
@@ -126,15 +122,43 @@
@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,
- 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璋冪敤锛宒eviceId锛�%s锛宑hannelId锛�%s锛宒ownloadSpeed锛�%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 requestMessage = new RequestMessage();
+ requestMessage.setId(uuid);
+ requestMessage.setKey(key);
+
+
+ playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed),
+ (code, msg, data)->{
+
+ 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);
+ }
+ requestMessage.setData(wvpResult);
+ resultHolder.invokeResult(requestMessage);
});
return result;
@@ -155,7 +179,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 +197,11 @@
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "stream", description = "娴両D", 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);
}
}
--
Gitblit v1.8.0