From 83bed9e77878cbe11e797b58fa2c2a48061e4555 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 29 Jan 2021 11:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 cba500c..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,12 +131,15 @@
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));
alarm.setPlace((String) list.get(0).get("streeName"));//事发地址
alarm.setDeviceNumber((String) list.get(0).get("deviceNumber"));//设备编号
- alarm.setDistrict((String) list.get(0).get("district"));//行政区编码
+ alarm.setDistrict((String) list.get(0).get("district"));//县区
+ alarm.setProvince((String) list.get(0).get("province"));//市
+ alarm.setCity((String) list.get(0).get("city"));
alarm.setJd((String) list.get(0).get("jd"));//经度
alarm.setWd((String) list.get(0).get("wd"));//纬度
alarm.setJtype("0");
--
Gitblit v1.9.3