From a644c4bb75b173d14fad9ed7dc7cf85c41d4953a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 02 Mar 2021 23:12:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
index 3604122..691565b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -131,6 +131,7 @@
List<Map<String, Object>> list = serverHandler.equipmentService.selectInfos(devId);
Alarm alarm= new Alarm();
alarm.setAlarmType("一键报警");
+ alarm.setGalarmPeople("报警主机");
Date day = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
alarm.setAlarmTime(df.format(day));
--
Gitblit v1.9.3