From ebb1a448339bafc4c4849fdbc2291bd3a28261df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 一月 2024 10:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 50db4c3..5a16078 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
@@ -31,6 +31,7 @@
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -119,7 +120,7 @@
try {
ImageResources imageResources = new ImageResources();
- imageResources.setType("01");
+ imageResources.setType("05");
imageResources.setBelongToId(baseCase.getId());
imageResources.setUrl(videoAlarmReport.getPicData());
imageResources.setCreateTime(LocalDateTime.now());
@@ -138,9 +139,8 @@
VideoPoint videoPoint = videoPointService.getByCode(alarmParam.getEventNumber());
List<DataDictionary> dataDictionaries = dataDictionaryService.queryByRemark(alarmParam.getSubject());
-
- Instant instant = Instant.ofEpochMilli(Long.parseLong(alarmParam.getIncidentDate()));
- LocalDateTime alarmTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+ 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).
@@ -187,7 +187,7 @@
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());
--
Gitblit v1.8.0