From c4c1c6cf89781eb06dc02b677a8954fdb2666c43 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 七月 2025 22:39:06 +0800
Subject: [PATCH] 添加时间筛选
---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 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 dfc786e..994bcc8 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
@@ -176,45 +176,47 @@
inputStream = new ByteArrayInputStream(os.toByteArray());
}
- picData = ossService.uploadImages(inputStream, extension,0);
+ picData = ossService.uploadImages(inputStream, extension, 0);
} catch (Exception e) {
System.out.println("淇濆瓨鎶ヨ鏁版嵁澶辫触---鍥剧墖涓婁紶澶辫触锛�" + e.getMessage());
// e.printStackTrace();
}
}
- List<VideoAlarmReport> videoAlarmReports = new ArrayList<>();
+ if (!StringUtils.isEmpty(picData)) {
+ List<VideoAlarmReport> videoAlarmReports = new ArrayList<>();
- List<AlarmDataParam> alarmData = alarmParam.getAlarmData();
- for (AlarmDataParam alarmDatum : alarmData) {
- List<VideoAlarmReport> list = getByAlarmId(alarmDatum.getAlarmID());
- try {
- Date date = sdf.parse(alarmDatum.getAlarmTime());
- Instant instant = date.toInstant();
- ZoneId zoneId = ZoneId.systemDefault();
- VideoAlarmReport videoAlarmReport = VideoAlarmReport.builder()
- .ip(cameraInf.getIp()).port(cameraInf.getPort())
- .user(cameraInf.getUser()).password(cameraInf.getPassword())
- .channel(cameraInf.getChannel()).platResourceId(cameraInf.getPlatResourceID())
- .picData(picData).alarmTime(instant.atZone(zoneId).toLocalDateTime())
- .alarmId(alarmDatum.getAlarmID()).algoType(alarmDatum.getAlgoType())
- .alarmType(alarmDatum.getAlarmType()).alarmName(alarmDatum.getAlarmName())
- .algoName(alarmDatum.getAlgoName()).alarmObj(JSON.toJSONString(alarmDatum.getAlarmObject()))
- .build();
- if (list.size() == 0) {
+ List<AlarmDataParam> alarmData = alarmParam.getAlarmData();
+ for (AlarmDataParam alarmDatum : alarmData) {
+ List<VideoAlarmReport> list = getByAlarmId(alarmDatum.getAlarmID());
+ try {
+ Date date = sdf.parse(alarmDatum.getAlarmTime());
+ Instant instant = date.toInstant();
+ ZoneId zoneId = ZoneId.systemDefault();
+ VideoAlarmReport videoAlarmReport = VideoAlarmReport.builder()
+ .ip(cameraInf.getIp()).port(cameraInf.getPort())
+ .user(cameraInf.getUser()).password(cameraInf.getPassword())
+ .channel(cameraInf.getChannel()).platResourceId(cameraInf.getPlatResourceID())
+ .picData(picData).alarmTime(instant.atZone(zoneId).toLocalDateTime())
+ .alarmId(alarmDatum.getAlarmID()).algoType(alarmDatum.getAlgoType())
+ .alarmType(alarmDatum.getAlarmType()).alarmName(alarmDatum.getAlarmName())
+ .algoName(alarmDatum.getAlgoName()).alarmObj(JSON.toJSONString(alarmDatum.getAlarmObject()))
+ .build();
+ if (list.size() == 0) {
- videoAlarmReports.add(videoAlarmReport);
+ videoAlarmReports.add(videoAlarmReport);
- this.saveBatch(videoAlarmReports, videoAlarmReports.size());
+ this.saveBatch(videoAlarmReports, videoAlarmReports.size());
- violationsService.saveFromVideo(videoAlarmReports);
+ violationsService.saveFromVideo(videoAlarmReports);
- } else {
- videoAlarmReport.setId(list.get(0).getId());
- this.updateById(videoAlarmReport);
- }
- } catch (ParseException e) {
- System.out.println("淇濆瓨鎶ヨ鏁版嵁澶辫触锛�" + e.getMessage());
+ } else {
+ videoAlarmReport.setId(list.get(0).getId());
+ this.updateById(videoAlarmReport);
+ }
+ } catch (ParseException e) {
+ System.out.println("淇濆瓨鎶ヨ鏁版嵁澶辫触锛�" + e.getMessage());
// e.printStackTrace();
+ }
}
}
}
--
Gitblit v1.8.0