From feffedd3a450e935debea24599cb5ce2f4c06ab2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 14 三月 2023 10:18:39 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 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..f467ad8 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,25 @@
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.http.MediaType;
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.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
/**
* @author admin
@@ -21,7 +29,11 @@
@RequestMapping("/API")
public class AlarmController {
+
private IVideoAlarmReportService videoAlarmReportService;
+
+ @Autowired
+ private VideoUtil videoUtil;
@Autowired
public void setVideoAlarmReportService(IVideoAlarmReportService videoAlarmReportService) {
@@ -35,4 +47,58 @@
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));
+ }
+
+
+ @ApiOperation(value = "鑾峰彇鍥剧墖")
+ @GetMapping(value = "/img", produces = MediaType.IMAGE_PNG_VALUE)
+ @ResponseBody
+ public byte[] getImages(HttpServletResponse response, @RequestParam String fileUrl) {
+ try {
+ URL url = new URL(fileUrl);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(5 * 1000);
+ conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+
+ InputStream inputStream = conn.getInputStream();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹�
+
+ byte[] data = readInputStream(inputStream);
+ return data;
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ private byte[] readInputStream(InputStream inStream) throws Exception {
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ //鍒涘缓涓�涓狟uffer瀛楃涓�
+ byte[] buffer = new byte[1024];
+ //姣忔璇诲彇鐨勫瓧绗︿覆闀垮害锛屽鏋滀负-1锛屼唬琛ㄥ叏閮ㄨ鍙栧畬姣�
+ int len = 0;
+ //浣跨敤涓�涓緭鍏ユ祦浠巄uffer閲屾妸鏁版嵁璇诲彇鍑烘潵
+ while ((len = inStream.read(buffer)) != -1) {
+ //鐢ㄨ緭鍑烘祦寰�buffer閲屽啓鍏ユ暟鎹紝涓棿鍙傛暟浠ｈ〃浠庡摢涓綅缃紑濮嬭锛宭en浠ｈ〃璇诲彇鐨勯暱搴�
+ outStream.write(buffer, 0, len);
+ }
+ //鍏抽棴杈撳叆娴�
+ inStream.close();
+ //鎶妎utStream閲岀殑鏁版嵁鍐欏叆鍐呭瓨
+ return outStream.toByteArray();
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0