From f6b6188425efe6dc2c41a8dafb66f8ddd609a87f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 20 八月 2023 21:30:57 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 77 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 11 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 f9aa42f..257e41b 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,6 +1,9 @@
package com.ycl.controller.platformApi;
+import cn.hutool.json.JSONConverter;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.dto.video.AlarmParam;
import com.ycl.enums.common.ResultCode;
@@ -14,11 +17,16 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.Base64;
+import java.util.Dictionary;
+import java.util.Hashtable;
/**
* @author admin
@@ -28,6 +36,8 @@
@RequestMapping("/API")
public class AlarmController {
private IVideoAlarmReportService videoAlarmReportService;
+
+ private static Dictionary<String, Integer> sessionDic = new Hashtable<>();
@Autowired
private VideoUtil videoUtil;
@@ -39,7 +49,9 @@
@ApiOperation("瑙嗛鎶ヨ鎺ㄩ�丄PI")
@PostMapping("/AlarmReport")
+ @LogSave(operationType = "鎶ヨ绠＄悊", contain = "瑙嗛鎶ヨ鎺ㄩ��")
public CommonResult alarmReport(@RequestBody @Validated AlarmParam alarmParam) {
+// System.out.println("淇濆瓨鎶ヨ鏁版嵁锛�" + JSONObject.toJSONString(alarmParam));
videoAlarmReportService.save(alarmParam);
return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
}
@@ -64,28 +76,71 @@
@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(required = false) String OSSAccessKeyId,
+ public byte[] getImages(HttpServletRequest request, HttpServletResponse response,
+ @RequestParam String fileUrl, @RequestParam(required = false) String OSSAccessKeyId,
@RequestParam(required = false) String Signature) {
+ String sessionId = request.getSession().getId();
+ sessionDic.put(sessionId, 0);
+ return getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+
+ }
+
+ private byte[] getBytes(String fileUrl, String OSSAccessKeyId, String Signature, String sessionId) {
+ int index = sessionDic.get(sessionId);
try {
- URL url = new URL(fileUrl);
- 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)");
+ if (sessionDic.get(sessionId) < 10) {
+ sessionDic.remove(sessionId);
+ fileUrl = fileUrl.replace("Expires","v");
+ System.out.println("getImages鑾峰彇鍥剧墖鍦板潃锛�" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
+ 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();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹�
+ InputStream inputStream = conn.getInputStream();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹�
- byte[] data = readInputStream(inputStream);
- return data;
+ byte[] data = readInputStream(inputStream);
+ System.out.println("getImages鑾峰彇鍥剧墖鎴愬姛");
+ return data;
+ }
} catch (Exception e) {
- System.out.println("鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
+ index++;
+ sessionDic.put(sessionId, index);
+ System.out.println(index + "-getImages鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
e.printStackTrace();
+ getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+
}
return null;
}
+ private static String inputStream2Base64(InputStream is) throws Exception {
+ byte[] data = null;
+ try {
+ ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
+ byte[] buff = new byte[100];
+ int rc = 0;
+ while ((rc = is.read(buff, 0, 100)) > 0) {
+ swapStream.write(buff, 0, rc);
+ }
+ data = swapStream.toByteArray();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ throw new Exception("杈撳叆娴佸叧闂紓甯�");
+ }
+ }
+ }
+
+ return Base64.getEncoder().encodeToString(data);
+ }
+
private byte[] readInputStream(InputStream inStream) throws Exception {
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
//鍒涘缓涓�涓狟uffer瀛楃涓�
--
Gitblit v1.8.0