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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 5abc6b7..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;
@@ -46,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());
}
@@ -72,7 +77,8 @@
// @GetMapping(value = "/img")
@ResponseBody
public byte[] getImages(HttpServletRequest request, HttpServletResponse response,
- @RequestParam String fileUrl, @RequestParam String OSSAccessKeyId, @RequestParam String Signature) {
+ @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);
@@ -84,6 +90,7 @@
try {
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();
--
Gitblit v1.8.0