From 0c420edb24c2f3a783706e65f0ad76f282518d22 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 12 三月 2024 16:15:00 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 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 b32471e..b97fd39 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,8 @@
package com.ycl.service.caseHandler.impl;
+import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.util.UtilNumber;
import com.ycl.dto.video.HKAlarmParam;
@@ -21,6 +23,7 @@
import com.ycl.service.dict.IDataDictionaryService;
import com.ycl.service.region.ISccgRegionService;
import com.ycl.service.resources.IImageResourcesService;
+import com.ycl.service.video.IVideoAlarmReportService;
import com.ycl.service.video.impl.IVideoPointService;
import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +33,7 @@
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -49,6 +53,7 @@
private IDataDictionaryService dataDictionaryService;
private IImageResourcesService imageResourcesService;
private ISccgRegionService regionService;
+ private IVideoAlarmReportService videoAlarmReportService;
@Resource
BaseCaseMapper baseCaseMapper;
@@ -78,6 +83,11 @@
@Autowired
public void setRegionService(ISccgRegionService regionService) {
this.regionService = regionService;
+ }
+
+ @Autowired
+ public void setVideoAlarmReportService(IVideoAlarmReportService videoAlarmReportService) {
+ this.videoAlarmReportService = videoAlarmReportService;
}
@Override
@@ -112,13 +122,19 @@
try {
ImageResources imageResources = new ImageResources();
- imageResources.setType("01");
+ imageResources.setType("05");
imageResources.setBelongToId(baseCase.getId());
imageResources.setUrl(videoAlarmReport.getPicData());
imageResources.setCreateTime(LocalDateTime.now());
+
+ ImageResources imageResources1 = new ImageResources();
+ BeanUtil.copyProperties(imageResources,imageResources1);
+ imageResources1.setType("01");
+
+ imageResourcesService.save(imageResources1);
imageResourcesService.save(imageResources);
} catch (Exception ex) {
-
+ System.out.println("娴峰悍鎺ㄩ�佷繚瀛樺紓甯革細" + ex.getMessage());
}
}
}
@@ -131,12 +147,12 @@
VideoPoint videoPoint = videoPointService.getByCode(alarmParam.getEventNumber());
List<DataDictionary> dataDictionaries = dataDictionaryService.queryByRemark(alarmParam.getSubject());
-
- Instant instant = Instant.ofEpochMilli(Long.parseLong(alarmParam.getIncidentDate()));
+ DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime alarmTime = LocalDateTime.parse(alarmParam.getIncidentDate(), df);
BaseCase baseCase = BaseCase.builder().eventSource(1).category(QuestionCategory.VIOLATION.getCode())
.code(utilNumber.createCaseCode()).createTime(LocalDateTime.now()).createUser(0L).state(1).
- alarmTime(LocalDateTime.ofInstant(instant, ZoneId.systemDefault())).build();
+ alarmTime(alarmTime).build();
Violations violations = new Violations();
baseCase.setLatitude(alarmParam.getLatitude());
@@ -159,22 +175,42 @@
if (videoPoint != null) {
violations.setVideoPointId(videoPoint.getId());
}
- baseMapper.insert(violations);
+
String[] imgs = alarmParam.getFileUrl().split(",");
+
+ VideoAlarmReport videoAlarmReport = new VideoAlarmReport();
+ videoAlarmReport.setPlatResourceId(alarmParam.getEventNumber());
+ if (imgs.length > 0) {
+ videoAlarmReport.setPicData(imgs[0]);
+ }
+ videoAlarmReport.setAlarmTime(alarmTime);
+ videoAlarmReport.setAlarmId(alarmParam.getEventId());
+ videoAlarmReport.setAlgoName(alarmParam.getContact());
+ videoAlarmReport.setAlarmName(alarmParam.getSubject());
+ videoAlarmReportService.save(videoAlarmReport);
+
+ violations.setVideoAlarmReportId(videoAlarmReport.getId());
+ baseMapper.insert(violations);
try {
for (int i = 0; i < imgs.length; i++) {
ImageResources imageResources = new ImageResources();
- imageResources.setType("01");
+ imageResources.setType("04");
imageResources.setBelongToId(baseCase.getId());
imageResources.setUrl(imgs[i]);
imageResources.setCreateTime(LocalDateTime.now());
- imageResourcesService.save(imageResources);
+ ImageResources imageResources1 = new ImageResources();
+ BeanUtil.copyProperties(imageResources,imageResources1);
+ imageResources1.setType("01");
+
+ imageResourcesService.save(imageResources1);
+ imageResourcesService.save(imageResources);
}
} catch (Exception ex) {
}
+
}
@Override
--
Gitblit v1.8.0