Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-30 e986bd63309fba70f7f3cfaf70aadec46220917b

 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();
                }
            }


        }
    }