From 6ab9373c0d0d3dbec39e0435142be1ccef0aa41e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 20 Mar 2021 18:00:31 +0800
Subject: [PATCH] 报警分发接口完成

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java |   12 ++++++------
 1 files changed, 6 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 91a096f..ff09a20 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
@@ -1723,17 +1723,17 @@
 					if (police.size() != 0){
 						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));
+						Date date = new Date();
+						SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+						alarm.setJjTime(dateFormat.format(date));
 
 						serverHandler.alarmService.updatePoliceStatus( police.get(0).get("alarmId").toString(),"1");
 					}else {
 						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));
+						Date date = new Date();
+						SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+						alarm.setJjTime(dateFormat.format(date));
 
 						serverHandler.alarmService.updatePoliceStatus(online_police.get(0).get("id").toString(),"1");
 					}

--
Gitblit v1.9.3