From 56eb713f9edcf2268283537e76d5e29be1fdfbad Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 19 Mar 2021 20:22:43 +0800
Subject: [PATCH] 报警分发接口完成
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 bcafbc6..18bf84c 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
@@ -139,6 +139,7 @@
List<String> outData = new ArrayList<>();
switch (content.substring(0, 2)) {
case "LA": {
+ System.out.println("按下按钮+++++++++++++++++++++++++++++++++");
String devId = content.substring(10, 22);
//String fqbm = content.substring(24, 26);
String d = content.substring(26, 27);
@@ -1670,21 +1671,21 @@
List<Map<String, Object>> police = serverHandler.alarmService.queryPoliceTime(policeIdArr);
if (police.size() != 0){
- alarm.setAlarmId((String) police.get(0).get("alarmId"));
- alarm.setAlarmPeople((String) police.get(0).get("alarmPeople"));
+ alarm.setAlarmId( police.get(0).get("alarmId").toString());
+ alarm.setAlarmPeople( police.get(0).get("alarmPeople").toString());
// Date date = new Date();
// SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// alarm.setJjTime(dateFormat.format(date));
- serverHandler.alarmService.updatePoliceStatus((String) police.get(0).get("alarmId"),"1");
+ serverHandler.alarmService.updatePoliceStatus( police.get(0).get("alarmId").toString(),"1");
}else {
- alarm.setAlarmId((String) police.get(0).get("alarmId"));
- alarm.setAlarmPeople((String) online_police.get(0).get("name"));
+ alarm.setAlarmId( online_police.get(0).get("id").toString());
+ alarm.setAlarmPeople(online_police.get(0).get("name").toString());
// Date date = new Date();
// SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// alarm.setJjTime(dateFormat.format(date));
- serverHandler.alarmService.updatePoliceStatus((String) police.get(0).get("alarmId"),"1");
+ serverHandler.alarmService.updatePoliceStatus(online_police.get(0).get("id").toString(),"1");
}
serverHandler.alarmService.s(alarm);
--
Gitblit v1.9.3