Merge remote-tracking branch 'origin/master'

zengh

2021-04-29 958ddfcec71043b6b800feaac521e7b22bb15e97

 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("紧急求救")){
                  //警情分发测试代码