From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 21:44:06 +0800
Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 139 ++++++++++++++++++++++++++++++---------------
1 files changed, 92 insertions(+), 47 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 51640c9..18ca512 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
@@ -9,11 +9,16 @@
import org.springblade.jfpt.Netty.service.nettyService;
import org.springblade.jfpt.alarm.entity.Alarm;
import org.springblade.jfpt.alarm.service.IAlarmService;
+import org.springblade.jfpt.alarm.vo.AlarmVO;
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.message.entity.Message;
+import org.springblade.jfpt.message.service.IMessageService;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.operation.vo.OperationVO;
+import org.springblade.jfpt.webscoket.service.IPushMsgService;
+import org.springblade.system.user.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -43,6 +48,9 @@
private org.springblade.jfpt.Netty.service.nettyService nettyService;
@Autowired
+ private IMessageService messageService;
+
+ @Autowired
private IEquipmentService equipmentService;
@Autowired
@@ -50,6 +58,9 @@
@Autowired
private IAlarmService alarmService;
+
+ @Autowired
+ private IPushMsgService pushMsgService;
@Autowired
private IOperationService operationService;
@@ -106,6 +117,8 @@
@Override
public void channelRead(ChannelHandlerContext channelHandlerContext, Object info) throws Exception {
long startTime1 = System.currentTimeMillis();
+ Date day = new Date();
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
System.out.println("接收到了：" + info);
ByteBuf buf = (ByteBuf) info;
byte[] req = new byte[buf.readableBytes()];
@@ -157,8 +170,6 @@
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"));//设备编号
@@ -169,6 +180,8 @@
alarm.setWd((String) list.get(0).get("wd"));//纬度
alarm.setCid(String.valueOf(a));//警情代码
alarm.setJtype("0");
+ //修改设备状态
+ serverHandler.equipmentService.updateExstate("一键报警",null,(String) list.get(0).get("deviceNumber"));
switch (num) {
case "00":
if (fqbm.equals("0")) {
@@ -1714,58 +1727,90 @@
break;
}
- //警情分发测试代码
- //查询所有闲置的接警员
- List<Map<String, Object>> policeList = serverHandler.alarmService.queryPolice();
- List<Map<String, Object>> online_police = new ArrayList<>();
- for (int i = 0; i < policeList.size(); i++) {
- if (policeList.get(i).get("work_status").equals(0)){
+ //报文内容保存
+ Message message = new Message();
+ message.setEnumber(ChannelName);
+ message.setContent(body);
+ message.setTime(df.format(day));
+ serverHandler.messageService.save(message);
+
+ if(alarm.getWaringType().equals("紧急求救")){
+ //警情分发测试代码
+ //查询所有闲置的接警员
+ List<User> policeList = serverHandler.alarmService.queryPolice();
+ List<User> online_police = new ArrayList<>();
+ List<User> zx_police = new ArrayList<>();
+ for (int i = 0; i < policeList.size(); i++) {
//System.out.println(policeList.get(i).get("real_name"));
- online_police.add(policeList.get(i));
+ if(policeList.get(i).getOnline_status().equals("1")){
+ zx_police.add(policeList.get(i));
+ if (policeList.get(i).getWork_status().equals("0")){
+ online_police.add(policeList.get(i));
+ }
+ }
+ }
+
+
+ //如果无在线闲置人员
+ if (online_police.size() == 0){
+
+ //判断是否有在线人员
+ if (zx_police.size() == 0){
+ //无在线人员，选取所有接警员
+ online_police = policeList;
+ }else{
+ //有在线人员
+ online_police = zx_police;
+ }
+
+ }
+
+ List policeIdArr = new ArrayList();
+
+ //将闲置状态的人员id存入数组
+ for (int i = 0; i < online_police.size(); i++) {
+ policeIdArr.add(online_police.get(i).getId());
+ }
+
+ //通过id计算接警员最后一次接警时间，倒序返回闲置最久的人员，派发任务
+ List<AlarmVO> police = serverHandler.alarmService.queryPoliceTime(policeIdArr);
+
+ if (police.size() != 0){
+ alarm.setAlarmId( police.get(0).getAlarmId().toString());
+ alarm.setAlarmPeople( police.get(0).getAlarmPeople().toString());
+ alarm.setPhoneNumber( police.get(0).getPhoneNumber().toString());
+ 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).getAlarmId().toString(),"1");
+ }else {
+ alarm.setAlarmId( online_police.get(0).getId().toString());
+ alarm.setAlarmPeople(online_police.get(0).getName().toString());
+ alarm.setPhoneNumber(online_police.get(0).getPhone().toString());
+ 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).getId().toString(),"1");
}
}
- if (online_police.size() == 0){
- online_police = policeList;
- }
-
- List policeIdArr = new ArrayList();
-
- //将闲置状态的人员id存入数组
- for (int i = 0; i < online_police.size(); i++) {
- policeIdArr.add(online_police.get(i).get("id"));
- }
-
- //通过id计算接警员最后一次接警时间，倒序返回闲置最久的人员，派发任务
- List<Map<String, Object>> police = serverHandler.alarmService.queryPoliceTime(policeIdArr);
-
- 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));
-
- 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));
-
- 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);
+ if(alarm.getWaringType().equals("紧急求救")){
+ 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);
+
+ //通过websocket给前端接警员发送信息
+ serverHandler.pushMsgService.pushMsg(alarm.getAlarmId(), alarm.getId().toString());
+ }
outData.add("LEOK#@");
long endTime1 = System.currentTimeMillis(); //获取结束时间
--
Gitblit v1.9.3