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 | 14 +++++++-------
1 files changed, 7 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 2e31878..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
@@ -136,12 +136,6 @@
}
} else {
String ChannelName = content.substring(10, 22);//设备编码
- //报文内容保存
- Message message = new Message();
- message.setEnumber(ChannelName);
- message.setContent(body);
- message.setTime(df.format(day));
- serverHandler.messageService.save(message);
String sub = content.substring(23, 27);
ConcurrentHashMap<String, Channel> channelHashMap = ChannelMap.getChannelHashMap();
if (channelHashMap == null) {
@@ -1728,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("紧急求救")){
//警情分发测试代码
@@ -1802,7 +1802,7 @@
serverHandler.operationService.save(operation);
//通过websocket给前端接警员发送信息
- //serverHandler.pushMsgService.pushMsg(alarm.getAlarmId(), alarm.getId().toString());
+ serverHandler.pushMsgService.pushMsg(alarm.getAlarmId(), alarm.getId().toString());
}
outData.add("LEOK#@");
--
Gitblit v1.9.3