From d3e5446447c79948eee93035900401aff50706fb Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 31 三月 2023 15:58:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
index 6c5b489..8794a56 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
@@ -61,7 +61,9 @@
public void saveFromVideo(List<VideoAlarmReport> videoAlarmReports) {
for (VideoAlarmReport videoAlarmReport : videoAlarmReports) {
VideoPoint videoPoint = null;
- LambdaQueryWrapper<VideoPoint> queryWrapper = new LambdaQueryWrapper<VideoPoint>().eq(VideoPoint::getPlatResourceId, videoAlarmReport.getPlatResourceId());
+ LambdaQueryWrapper<VideoPoint> queryWrapper = new LambdaQueryWrapper<VideoPoint>()
+ .eq(VideoPoint::getPlatResourceId, videoAlarmReport.getPlatResourceId())
+ .or().eq(VideoPoint::getCode, videoAlarmReport.getPlatResourceId());
List<VideoPoint> pointList = videoPointService.list(queryWrapper);
if (pointList.size() > 0) {
videoPoint = pointList.get(0);
--
Gitblit v1.8.0