From acea9131318ee6823d008b386e52fee573882b2e Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 18 十二月 2023 15:14:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/resources/application-online.yml | 8 ++++++++ ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 6 +++--- 2 files changed, 11 insertions(+), 3 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..9a13aa8 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; @@ -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). diff --git a/ycl-platform/src/main/resources/application-online.yml b/ycl-platform/src/main/resources/application-online.yml index 3c816a9..644466e 100644 --- a/ycl-platform/src/main/resources/application-online.yml +++ b/ycl-platform/src/main/resources/application-online.yml @@ -67,11 +67,19 @@ videoPoint: url: http://172.28.194.180:7901 + web_url: https://172.28.194.185:8282 + # web_url: http://172.28.194.185:8281 port: 7901 userName: suichang passWord: a12345677 ip: 10.10.10.10 +DH: + web_url: http://172.28.194.185:8281 + port: 8281 + userName: zfgy + passWord: zfj12345 + aliyun: oss: endpoint: http://oss-cn-zjls-lszwy-d01-a.ops.zjlscloud.com -- Gitblit v1.8.0