From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
index 51d7f17..cd69ba3 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
@@ -9,6 +9,7 @@
import com.ycl.entity.video.VideoAlarmReport;
import com.ycl.mapper.video.VideoAlarmReportMapper;
import com.ycl.service.caseHandler.IViolationsService;
+import com.ycl.service.oss.OssService;
import com.ycl.service.video.IVideoAlarmReportService;
import com.ycl.utils.MediaFileUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,9 @@
private MediaFileUtil mediaFileUtil;
private IViolationsService violationsService;
+
+ @Autowired
+ private OssService ossService;
@Autowired
public void setMediaFileUtil(MediaFileUtil mediaFileUtil) {
@@ -141,7 +145,6 @@
// 鎸夌収Base64缂栫爜瑙ｆ瀽鏁版嵁
byte[] data = DatatypeConverter.parseBase64Binary(alarmParam.getPicData());
InputStream inputStream = new ByteArrayInputStream(data);
-
try {
// 濡傛灉List<AlarmDataParam>鍚堢悊
if (alarmParam.getAlarmData()!=null && alarmParam.getAlarmData().size()!=0) {
@@ -169,10 +172,10 @@
ByteArrayOutputStream os = new ByteArrayOutputStream();
ImageIO.write(image, extension, os);
- inputStream = new ByteArrayInputStream(os.toByteArray());
+ ByteArrayInputStream inputStream1 = new ByteArrayInputStream(os.toByteArray());
}
- picData = mediaFileUtil.savePicture(inputStream, extension);
+ picData = ossService.uploadImages(inputStream, extension);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0