From e986bd63309fba70f7f3cfaf70aadec46220917b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 30 三月 2023 20:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 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 d2016ca..6c5b489 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
@@ -1,6 +1,7 @@
package com.ycl.service.caseHandler.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.EventSource;
import com.ycl.entity.caseHandler.QuestionCategory;
@@ -8,15 +9,18 @@
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.video.VideoAlarmReport;
import com.ycl.entity.video.VideoPoint;
+import com.ycl.enums.common.DictTypeEnum;
+import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.ViolationsMapper;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IViolationsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.service.dict.IDataDictionaryService;
import com.ycl.service.video.impl.IVideoPointService;
-import com.ycl.service.video.impl.VideoPointServiceImpl;
+import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
@@ -33,14 +37,24 @@
private IVideoPointService videoPointService;
private IBaseCaseService baseCaseService;
+ private IDataDictionaryService dataDictionaryService;
+
+ @Resource
+ BaseCaseMapper baseCaseMapper;
@Autowired
public void setVideoPointService(IVideoPointService videoPointService) {
this.videoPointService = videoPointService;
}
+
@Autowired
public void setBaseCaseService(IBaseCaseService baseCaseService) {
this.baseCaseService = baseCaseService;
+ }
+
+ @Autowired
+ public void setDataDictionaryService(IDataDictionaryService dataDictionaryService) {
+ this.dataDictionaryService = dataDictionaryService;
}
@Override
@@ -53,19 +67,35 @@
videoPoint = pointList.get(0);
}
BaseCase baseCase = BaseCase.builder().eventSource(EventSource.VIDEO.getCode()).category(QuestionCategory.VIOLATION.getCode())
- .createTime(LocalDateTime.now()).createUser(0).state(1).alarmTime(videoAlarmReport.getAlarmTime()).build();
+ .createTime(LocalDateTime.now()).createUser(0L).state(1).alarmTime(videoAlarmReport.getAlarmTime()).build();
Violations violations = new Violations();
if (videoPoint != null) {
baseCase.setLatitude(videoPoint.getLatitude());
baseCase.setLongitude(videoPoint.getLongitude());
baseCase.setStreetId(videoPoint.getStreetId());
baseCase.setCommunityId(videoPoint.getCommunityId());
+ baseCase.setSite(videoPoint.getAddress());
+ baseCase.setGridId(videoPoint.getGridId());
+ baseCase.setSite(videoPoint.getAddress());
+ baseCaseService.save(baseCase);
+ violations.setId(baseCase.getId());
+ violations.setVideoAlarmReportId(videoAlarmReport.getId());
+ violations.setVideoPointId(videoPoint.getId());
+ violations.setDescription(videoAlarmReport.getAlgoName());
+
+ List<DataDictionary> list = dataDictionaryService.queryByCode(DictTypeEnum.EVENT_GRADE_TYPE.getCode(), videoAlarmReport.getAlarmName().trim());
+ if (list.size() > 0) {
+ violations.setGradeId(list.get(0).getId());
+ }
+
+ baseMapper.insert(violations);
}
- baseCaseService.save(baseCase);
- violations.setId(baseCase.getId());
- violations.setVideoAlarmReportId(videoAlarmReport.getId());
- baseMapper.insert(violations);
}
}
-}
+
+ @Override
+ public List<VideoAndAreaVO> selectType() {
+ return baseCaseMapper.selectType();
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0