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 | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 00f1924..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
@@ -1,17 +1,17 @@
package com.ycl.controller.platformApi;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.ycl.api.CommonResult;
import com.ycl.dto.video.AlarmParam;
import com.ycl.enums.common.ResultCode;
import com.ycl.service.video.IVideoAlarmReportService;
+import com.ycl.util.VideoUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author admin
@@ -21,7 +21,11 @@
@RequestMapping("/API")
public class AlarmController {
+
private IVideoAlarmReportService videoAlarmReportService;
+
+ @Autowired
+ private VideoUtil videoUtil;
@Autowired
public void setVideoAlarmReportService(IVideoAlarmReportService videoAlarmReportService) {
@@ -35,4 +39,18 @@
return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
}
-}
+ @GetMapping("/Video/{code}/{subType}")
+ @ApiOperation(value = "璁惧鑾峰彇鐩戞帶鍦板潃")
+ @SneakyThrows
+ public CommonResult getMonitorAddress(@PathVariable String code, @PathVariable Integer subType,
+ @RequestParam(required = false) String scheme) {
+
+ if (subType == null) {
+ subType = 1;
+ }
+ if (!StringUtils.isNotBlank(scheme)) {
+ scheme = "RTSP";
+ }
+ return CommonResult.successApi(videoUtil.getVideo(code, scheme, subType));
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0