From 678fb878eec1c670a685fe84d8b36f77315069b3 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 04 九月 2023 10:14:12 +0800
Subject: [PATCH] 塔管理增加模型字段

---
 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