From 439480489111ecb1863e2ad0ceb2ff18150366ef Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 22 Mar 2021 09:38:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 8c1c349..51640c9 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
@@ -12,6 +12,8 @@
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.catalog.service.catalogService;
import org.springblade.jfpt.equipment.service.IEquipmentService;
+import org.springblade.jfpt.operation.service.IOperationService;
+import org.springblade.jfpt.operation.vo.OperationVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -48,6 +50,9 @@
@Autowired
private IAlarmService alarmService;
+
+ @Autowired
+ private IOperationService operationService;
private static ServerHandler serverHandler;
@@ -1738,22 +1743,30 @@
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");
}
-
serverHandler.alarmService.s(alarm);
+
+ OperationVO operation = new OperationVO();
+ operation.setSnumber(alarm.getAlarmId());
+ operation.setSname(alarm.getAlarmPeople());
+ operation.setJid(alarm.getId().toString());
+ operation.setZc("接警");
+ operation.setZctime(alarm.getJjTime());
+ serverHandler.operationService.save(operation);
+
outData.add("LEOK#@");
long endTime1 = System.currentTimeMillis(); //获取结束时间
--
Gitblit v1.9.3