From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化

---
 ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 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..5873897 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,10 @@
                         this.updateById(videoAlarmReport);
                     }
                 } catch (ParseException e) {
-                    e.printStackTrace();
+                    System.out.println("淇濆瓨鎶ヨ鏁版嵁澶辫触锛�" + e.getMessage());
+//                    e.printStackTrace();
                 }
             }
-
-
         }
     }
 

--
Gitblit v1.8.0