From e42d5134188b4e93ebb0580ef60034976c987f0f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 九月 2023 10:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index 275650e..0af7c58 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -283,7 +283,7 @@
GlobalAlarmData globalAlarmData = new GlobalAlarmData()
.setId(ardAlarmWall.getId())
.setName(ardAlarmWall.getWallName())
- .setAlarmTime(ardAlarmWall.getCreateTime())
+ .setAlarmTime(ardAlarmWall.getAlarmTime())
.setLongitude(ardAlarmWall.getLongitude())
.setLatitude(ardAlarmWall.getLatitude())
.setCount(ardAlarmWall.getCount())
@@ -592,6 +592,7 @@
@Override
public Object updateAlarmViewTime(GlobalAlarmCondition condition) {
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat fmtms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
switch (condition.getCommand()) {
case 1001:
ArdAlarmStealelec ardAlarmStealelec = ardAlarmStealelecMapper.selectByPrimaryKey(condition.getId());
@@ -662,7 +663,7 @@
ArdAlarmWall ardAlarmWall = ardAlarmWallMapper.selectArdAlarmWallById(condition.getId());
if (StringUtils.isNotNull(ardAlarmWall)) {
String userId = ardAlarmWall.getUserId();
- String alarmTime = fmt.format(ardAlarmWall.getCreateTime());
+ String alarmTime = fmtms.format(ardAlarmWall.getAlarmTime());
ardAlarmWallMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
return ardAlarmWall;
}
--
Gitblit v1.9.3