From 958ddfcec71043b6b800feaac521e7b22bb15e97 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 09:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 13 +++++++------
1 files changed, 7 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 5f89e58..4fd2dc1 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
@@ -44,6 +44,7 @@
@Autowired
private org.springblade.jfpt.Netty.service.nettyService nettyService;
+
@Autowired
private IMessageService messageService;
@@ -136,12 +137,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 +1723,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("紧急求救")){
//警情分发测试代码
--
Gitblit v1.9.3