From 3d68b56bb5ecbc3d34b2901c671dc7f1f0f82f74 Mon Sep 17 00:00:00 2001
From: pedoc <pedoc@qq.com>
Date: 星期一, 29 一月 2024 18:05:17 +0800
Subject: [PATCH] 修复未配置sipdomain时出现异常
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java | 38 ++++++--------------------------------
1 files changed, 6 insertions(+), 32 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 bf8f78b..0f971ec 100755
--- 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
@@ -6,6 +6,7 @@
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;
@@ -23,6 +24,7 @@
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;
@@ -69,7 +71,7 @@
@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)
@@ -123,7 +125,7 @@
}
- @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)
@@ -172,7 +174,7 @@
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 = "娴両D", required = true)
@@ -200,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 = "娴両D", required = true)
@@ -211,33 +213,5 @@
throw new ControllerException(ErrorCode.ERROR404);
}
return new StreamContent(downLoadInfo);
- }
-
- @Operation(summary = "鑾峰彇鍘嗗彶濯掍綋涓嬭浇鏂囦欢鍦板潃")
- @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
- @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
- @Parameter(name = "stream", description = "娴両D", required = true)
- @GetMapping("/download/file/path/{deviceId}/{channelId}/{stream}")
- public DeferredResult<WVPResult<DownloadFileInfo>> getDownloadFilePath(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
-
- DeferredResult<WVPResult<DownloadFileInfo>> result = new DeferredResult<>();
-
- result.onTimeout(()->{
- WVPResult<DownloadFileInfo> wvpResult = new WVPResult<>();
- wvpResult.setCode(ErrorCode.ERROR100.getCode());
- wvpResult.setMsg("timeout");
- result.setResult(wvpResult);
- });
-
- playService.getFilePath(deviceId, channelId, stream, (code, msg, data)->{
- WVPResult<DownloadFileInfo> wvpResult = new WVPResult<>();
- wvpResult.setCode(code);
- wvpResult.setMsg(msg);
- wvpResult.setData(data);
- result.setResult(wvpResult);
- });
-
-
- return result;
}
}
--
Gitblit v1.8.0