From a73593d70d59af01bc6afcd55ba817e319d228df Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:26:18 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
index dadc1fb..66f34f5 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
@@ -39,17 +39,16 @@
return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
}
- @GetMapping("/video")
+ @GetMapping("/Video/{code}/{subType}")
@ApiOperation(value = "璁惧鑾峰彇鐩戞帶鍦板潃")
@SneakyThrows
- public CommonResult getMonitorAddress(@RequestParam String code,
- @RequestParam(required = false) Integer subType,
+ public CommonResult getMonitorAddress(@PathVariable String code, @PathVariable Integer subType,
@RequestParam(required = false) String scheme) {
if (subType == null) {
subType = 1;
}
- if (StringUtils.isBlank(scheme)) {
+ if (!StringUtils.isNotBlank(scheme)) {
scheme = "RTSP";
}
return CommonResult.successApi(videoUtil.getVideo(code, scheme, subType));
--
Gitblit v1.8.0