From 5d4210f4f6dff3341c1a034857bf8da6cd7cf692 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 09:10:10 +0800
Subject: [PATCH] 报文保存位置修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 60b2c77..7e6b526 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,8 +12,11 @@
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -41,6 +44,8 @@
@Autowired
private org.springblade.jfpt.Netty.service.nettyService nettyService;
+ @Autowired
+ private IMessageService messageService;
@Autowired
private IEquipmentService equipmentService;
@@ -50,6 +55,9 @@
@Autowired
private IAlarmService alarmService;
+
+ @Autowired
+ private IPushMsgService pushMsgService;
@Autowired
private IOperationService operationService;
@@ -106,6 +114,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 +167,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"));//设备编号
@@ -1714,6 +1722,12 @@
break;
}
+ //报文内容保存
+ Message message = new Message();
+ message.setEnumber(ChannelName);
+ message.setContent(body);
+ message.setTime(df.format(day));
+ serverHandler.messageService.save(message);
if(alarm.getWaringType().equals("紧急求救")){
//警情分发测试代码
@@ -1786,6 +1800,9 @@
operation.setZc("接警");
operation.setZctime(alarm.getJjTime());
serverHandler.operationService.save(operation);
+
+ //通过websocket给前端接警员发送信息
+ serverHandler.pushMsgService.pushMsg(alarm.getAlarmId(), alarm.getId().toString());
}
outData.add("LEOK#@");
--
Gitblit v1.9.3