From 1d3c2136eea9788b5a5eab07784547e10bc7cc25 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 六月 2025 15:55:04 +0800
Subject: [PATCH] 优化报警
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
index 9b7cc4a..db6c769 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
@@ -241,7 +241,9 @@
FindPicturesByAlarmIdRequest findPicturesByAlarmIdRequest = new FindPicturesByAlarmIdRequest();
findPicturesByAlarmIdRequest.setAlarmId(upWarnMsgAdptInfo.getInfoId());
long warnTime = upWarnMsgAdptInfo.getWarnTime();
- findPicturesByAlarmIdRequest.setAlarmTime(LocalDateTime.ofEpochSecond(warnTime, 0, ZoneOffset.ofHours(8)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ String format = LocalDateTime.ofEpochSecond(warnTime, 0, ZoneOffset.ofHours(8)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
+ format = format.replace(" ", "T") + "+08:00";
+ findPicturesByAlarmIdRequest.setAlarmTime(format);
String pictures = Artemis.findPicturesByAlarmId(findPicturesByAlarmIdRequest);
JSONObject jsonObject = JSONObject.parseObject(pictures);
Integer code = jsonObject.getInteger("code");
@@ -358,7 +360,10 @@
upWarnMsgAdptInfo.setPicUrl("***");
FindPicturesByAlarmIdRequest findPicturesByAlarmIdRequest = new FindPicturesByAlarmIdRequest();
findPicturesByAlarmIdRequest.setAlarmId(data.getAlarmId());
- findPicturesByAlarmIdRequest.setAlarmTime(data.getAlarmTime());
+ long warnTime = upWarnMsgAdptInfo.getWarnTime();
+ String format = LocalDateTime.ofEpochSecond(warnTime, 0, ZoneOffset.ofHours(8)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
+ format = format.replace(" ", "T") + "+08:00";
+ findPicturesByAlarmIdRequest.setAlarmTime(format);
String pictures = Artemis.findPicturesByAlarmId(findPicturesByAlarmIdRequest);
JSONObject jsonObject1 = JSONObject.parseObject(pictures);
Integer code = jsonObject1.getInteger("code");
--
Gitblit v1.7.1