From 71c9980740cabdf03e842588bf1f6c851c35da6b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 14 六月 2023 21:11:08 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 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 276ce3a..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,6 +17,7 @@
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;
@@ -21,6 +25,8 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Base64;
+import java.util.Dictionary;
+import java.util.Hashtable;
/**
* @author admin
@@ -31,7 +37,7 @@
public class AlarmController {
private IVideoAlarmReportService videoAlarmReportService;
- private static Integer index = 0;
+ private static Dictionary<String, Integer> sessionDic = new Hashtable<>();
@Autowired
private VideoUtil videoUtil;
@@ -43,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());
}
@@ -68,17 +76,21 @@
@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) {
-
- index = 0;
- return getBytes(fileUrl, OSSAccessKeyId, Signature);
+ 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) {
+ private byte[] getBytes(String fileUrl, String OSSAccessKeyId, String Signature, String sessionId) {
+ int index = sessionDic.get(sessionId);
try {
- if (index < 10) {
- index++;
+ 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();
@@ -94,9 +106,12 @@
return data;
}
} catch (Exception e) {
- System.out.println(index + "getImages鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
- getBytes(fileUrl, OSSAccessKeyId, Signature);
- // e.printStackTrace();
+ index++;
+ sessionDic.put(sessionId, index);
+ System.out.println(index + "-getImages鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
+ e.printStackTrace();
+ getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+
}
return null;
}
--
Gitblit v1.8.0