From c3ce2bc5d069ba57309567aee4ae418bc0cf75ed Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 17 三月 2023 13:22:05 +0800
Subject: [PATCH] 优化异常处理以及级联设备状态查询
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java | 86 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 21 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
index af0c650..093b324 100644
--- 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,13 +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.IMediaServerService;
+import com.genersoft.iot.vmp.service.IDeviceService;
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;
@@ -16,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;
@@ -31,11 +30,13 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import java.time.LocalDate;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
import java.util.UUID;
@Tag(name = "鍥芥爣褰曞儚")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/gb_record")
public class GBRecordController {
@@ -53,6 +54,12 @@
@Autowired
private IPlayService playService;
+
+ @Autowired
+ private IDeviceService deviceService;
+
+
+
@Operation(summary = "褰曞儚鏌ヨ")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@@ -81,13 +88,18 @@
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(key);
- cmder.recordInfoQuery(device, channelId, startTime, endTime, sn, null, null, null, (eventResult -> {
- WVPResult<RecordInfo> wvpResult = new WVPResult<>();
- wvpResult.setCode(ErrorCode.ERROR100.getCode());
- wvpResult.setMsg("鏌ヨ褰曞儚澶辫触, status: " + eventResult.statusCode + ", message: " + eventResult.msg);
- msg.setData(wvpResult);
- resultHolder.invokeResult(msg);
- }));
+ try {
+ cmder.recordInfoQuery(device, channelId, startTime, endTime, sn, null, null, null, (eventResult -> {
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(ErrorCode.ERROR100.getCode());
+ wvpResult.setMsg("鏌ヨ褰曞儚澶辫触, status: " + eventResult.statusCode + ", message: " + eventResult.msg);
+ msg.setData(wvpResult);
+ resultHolder.invokeResult(msg);
+ }));
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鏌ヨ褰曞儚: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
resultHolder.put(key, uuid, result);
@@ -110,15 +122,33 @@
@Parameter(name = "endTime", description = "缁撴潫鏃堕棿", required = true)
@Parameter(name = "downloadSpeed", description = "涓嬭浇鍊嶉��", required = true)
@GetMapping("/download/start/{deviceId}/{channelId}")
- public DeferredResult<String> 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璋冪敤锛宒eviceId锛�%s锛宑hannelId锛�%s锛宒ownloadSpeed锛�%s", deviceId, channelId, downloadSpeed));
}
- DeferredResult<String> 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;
@@ -131,14 +161,24 @@
@GetMapping("/download/stop/{deviceId}/{channelId}/{stream}")
public void playStop(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
- cmder.streamByeCmd(deviceId, channelId, stream, null);
-
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧鍘嗗彶濯掍綋涓嬭浇鍋滄 API璋冪敤锛宒eviceId/channelId锛�%s_%s", deviceId, channelId));
}
if (deviceId == null || channelId == null) {
- throw new ControllerException(ErrorCode.ERROR100);
+ throw new ControllerException(ErrorCode.ERROR400);
+ }
+
+ Device device = deviceService.getDevice(deviceId);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "璁惧锛�" + deviceId + "鏈壘鍒�");
+ }
+
+ try {
+ cmder.streamByeCmd(device, channelId, stream, null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ logger.error("[鍋滄鍘嗗彶濯掍綋涓嬭浇]鍋滄鍘嗗彶濯掍綋涓嬭浇锛屽彂閫丅YE澶辫触 {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
}
@@ -147,7 +187,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