From e8a0f05f99f33fa05085536541da6bc27e66a644 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 14 四月 2023 14:57:55 +0800
Subject: [PATCH] bug修改

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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..5f0476c 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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.common.util.UtilNumber;
 import com.ycl.entity.caseHandler.BaseCase;
 import com.ycl.entity.caseHandler.EventSource;
 import com.ycl.entity.caseHandler.QuestionCategory;
@@ -43,6 +44,9 @@
     BaseCaseMapper baseCaseMapper;
 
     @Autowired
+    UtilNumber utilNumber;
+
+    @Autowired
     public void setVideoPointService(IVideoPointService videoPointService) {
         this.videoPointService = videoPointService;
     }
@@ -61,13 +65,15 @@
     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);
             }
             BaseCase baseCase = BaseCase.builder().eventSource(EventSource.VIDEO.getCode()).category(QuestionCategory.VIOLATION.getCode())
-                    .createTime(LocalDateTime.now()).createUser(0L).state(1).alarmTime(videoAlarmReport.getAlarmTime()).build();
+                    .code(utilNumber.createCaseCode()).createTime(LocalDateTime.now()).createUser(0L).state(1).alarmTime(videoAlarmReport.getAlarmTime()).build();
             Violations violations = new Violations();
             if (videoPoint != null) {
                 baseCase.setLatitude(videoPoint.getLatitude());

--
Gitblit v1.8.0