From e986bd63309fba70f7f3cfaf70aadec46220917b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 30 三月 2023 20:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java | 5 +----
1 files changed, 1 insertions(+), 4 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 39c4fcf..e7f2d55 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
@@ -145,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) {
@@ -173,7 +172,7 @@
ByteArrayOutputStream os = new ByteArrayOutputStream();
ImageIO.write(image, extension, os);
- ByteArrayInputStream inputStream1 = new ByteArrayInputStream(os.toByteArray());
+ inputStream = new ByteArrayInputStream(os.toByteArray());
}
picData = ossService.uploadImages(inputStream, extension);
@@ -215,8 +214,6 @@
e.printStackTrace();
}
}
-
-
}
}
--
Gitblit v1.8.0