From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +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 | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 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 cd69ba3..0d822f5 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
@@ -147,37 +147,38 @@
InputStream inputStream = new ByteArrayInputStream(data);
try {
// 濡傛灉List<AlarmDataParam>鍚堢悊
- if (alarmParam.getAlarmData()!=null && alarmParam.getAlarmData().size()!=0) {
+ if (alarmParam.getAlarmData() != null && alarmParam.getAlarmData().size() != 0) {
- BufferedImage image = ImageIO.read(inputStream);
- Graphics2D g2 = (Graphics2D) image.getGraphics();
- g2.setColor(Color.RED);
- g2.setStroke(new BasicStroke(3.0f));
+ BufferedImage image = ImageIO.read(inputStream);
+ Graphics2D g2 = (Graphics2D) image.getGraphics();
+ g2.setColor(Color.RED);
+ g2.setStroke(new BasicStroke(3.0f));
- List<AlarmDataParam> alarmData = alarmParam.getAlarmData();
+ List<AlarmDataParam> alarmData = alarmParam.getAlarmData();
- alarmData.forEach(new Consumer<AlarmDataParam>() {
- @Override
- public void accept(AlarmDataParam alarmDataParam) {
- List<AlarmObject> alarmObject = alarmDataParam.getAlarmObject();
- alarmObject.forEach(new Consumer<AlarmObject>() {
- @Override
- public void accept(AlarmObject alarmObject) {
- ObjectRect rect = alarmObject.getObjectRect();
- g2.drawRect(rect.getX(), rect.getY(), rect.getW(), rect.getH());
- }
- });
- }
- });
+ alarmData.forEach(new Consumer<AlarmDataParam>() {
+ @Override
+ public void accept(AlarmDataParam alarmDataParam) {
+ List<AlarmObject> alarmObject = alarmDataParam.getAlarmObject();
+ alarmObject.forEach(new Consumer<AlarmObject>() {
+ @Override
+ public void accept(AlarmObject alarmObject) {
+ ObjectRect rect = alarmObject.getObjectRect();
+ g2.drawRect(rect.getX(), rect.getY(), rect.getW(), rect.getH());
+ }
+ });
+ }
+ });
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- ImageIO.write(image, extension, os);
- ByteArrayInputStream inputStream1 = new ByteArrayInputStream(os.toByteArray());
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ ImageIO.write(image, extension, os);
+ inputStream = new ByteArrayInputStream(os.toByteArray());
}
picData = ossService.uploadImages(inputStream, extension);
} catch (Exception e) {
- e.printStackTrace();
+ System.out.println("淇濆瓨鎶ヨ鏁版嵁澶辫触---鍥剧墖涓婁紶澶辫触锛�" + e.getMessage());
+// e.printStackTrace();
}
}
List<VideoAlarmReport> videoAlarmReports = new ArrayList<>();
@@ -211,11 +212,17 @@
this.updateById(videoAlarmReport);
}
} catch (ParseException e) {
- e.printStackTrace();
+ System.out.println("淇濆瓨鎶ヨ鏁版嵁澶辫触锛�" + e.getMessage());
+// e.printStackTrace();
}
}
+ }
+ }
-
+ @Override
+ public void saveFromHK(HKAlarmParam alarmParam) {
+ if (alarmParam != null) {
+ violationsService.saveFromHKVideo(alarmParam);
}
}
--
Gitblit v1.8.0