From 810370b669c6606f79b4055bb00918917b2ae0ec Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 九月 2023 10:56:29 +0800
Subject: [PATCH] pwd
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 0328303..cf8633c 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())
@@ -924,6 +924,7 @@
case "杩愬姩鐩爣妫�娴�": aType="sys_radar_move";break;
case "鐑簮妫�娴�": aType="sys_radar_fire";break;
case "闆疯揪鎶芥补鏈哄仠鏈�": aType="sys_radar_pump";break;
+ default: aType=alarmType;break;
}
guideTask.setAlarmType(aType);
//閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
--
Gitblit v1.9.3