From 0879050c6f47cf61488848d2bdb882ec33bf341d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:46:52 +0800
Subject: [PATCH] 代码优化
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 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..8a52b21 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
@@ -10,8 +10,15 @@
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.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
/**
* @author admin
@@ -20,8 +27,6 @@
@RestController
@RequestMapping("/API")
public class AlarmController {
-
-
private IVideoAlarmReportService videoAlarmReportService;
@Autowired
@@ -39,19 +44,59 @@
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));
}
+
+
+ @ApiOperation(value = "鑾峰彇鍥剧墖")
+ @GetMapping(value = "/img", produces = {MediaType.IMAGE_JPEG_VALUE, MediaType.IMAGE_PNG_VALUE})
+// @GetMapping(value = "/img")
+ @ResponseBody
+ public byte[] getImages(HttpServletResponse response, @RequestParam String fileUrl, @RequestParam String OSSAccessKeyId, @RequestParam String Signature) {
+ try {
+ URL url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId +"&Signature=" + Signature);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(10 * 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