增加日志记录全量获取报警定义的过程

src/main/java/com/persagy/client/GroupNettyClientHandler.java

@@ -9,7 +9,6 @@ import com.persagy.cache.AlarmLastTimeCache;
 import com.persagy.cache.CreatedAlarmIdsCache;
 import com.persagy.entity.AlarmDefine;
 import com.persagy.entity.NettyMessage;
-import com.persagy.entity.ZktAlarmRecordDO;
 import com.persagy.job.NettyMessageQueue;
 import com.persagy.repository.AlarmRecordRepository;
 import com.persagy.service.AlarmDefineService;
@@ -20,9 +19,7 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 
-import javax.transaction.Transactional;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -84,10 +81,10 @@ public class GroupNettyClientHandler extends ChannelInboundHandlerAdapter {
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         log.info("Connected to: " + ctx.channel().remoteAddress());
-        ctx.channel().writeAndFlush(new NettyMessage<>(200,groupNettyClient.projectId).toString());
+        ctx.channel().writeAndFlush(new NettyMessage<>(200, groupNettyClient.projectId).toString());
         //启动的时候发送消息,获取全部报警定义
         //{"groupCode":"wd", "projectId":"Pj123"}
-        NettyMessage nettyMessage = new NettyMessage(4,groupNettyClient.projectId);
+        NettyMessage nettyMessage = new NettyMessage(4, groupNettyClient.projectId);
         nettyMessage.setRemark("连接已经建立；");
         JSONObject content = new JSONObject();
         content.put("groupCode", groupNettyClient.groupCode);
@@ -102,13 +99,13 @@ public class GroupNettyClientHandler extends ChannelInboundHandlerAdapter {
         try {
             log.info("--initAlarmResult--");
             TimeInterval timer = DateUtil.timer();
-            while (NettyMessageQueue.getNettyMessageQueue().size()>0 && timer.interval()<10000){
+            while (NettyMessageQueue.getNettyMessageQueue().size() > 0 && timer.interval() < 10000) {
                 String msg = NettyMessageQueue.getNettyMessageQueue().consume();
-                log.info("剩余报警消息令总数:{}",NettyMessageQueue.getNettyMessageQueue().size());
+                log.info("剩余报警消息令总数:{}", NettyMessageQueue.getNettyMessageQueue().size());
                 ctx.writeAndFlush(msg);
             }
         } catch (Exception e) {
-            log.error("发送报警消息失败",e);
+            log.error("发送报警消息失败", e);
         }
     }
 
@@ -124,7 +121,7 @@ public class GroupNettyClientHandler extends ChannelInboundHandlerAdapter {
         if (StringUtil.isJSONObject((String) msg)) {
             NettyMessage message = StringUtil.tranferItemToDTO((String) msg, NettyMessage.class);
             if (message.getOpCode() != 9) {
-                log.info("Client received: {}",msg);
+                log.info("Client received: {}", msg);
             } else {
                 log.info("全量获取报警定义完成");
             }
@@ -133,7 +130,7 @@ public class GroupNettyClientHandler extends ChannelInboundHandlerAdapter {
         try {
             TimeInterval timer = DateUtil.timer();
             handlerMsg(ctx, msg);
-            log.info("处理消息时间[{}]",timer.interval());
+            log.info("处理消息时间[{}]", timer.interval());
         } catch (Exception e) {
             log.error("channelRead", e);
         }
@@ -146,6 +143,7 @@ public class GroupNettyClientHandler extends ChannelInboundHandlerAdapter {
                 NettyMessage<AlarmDefine> AlarmDefineMessage = JSONObject.parseObject(String.valueOf(msg), new TypeReference<NettyMessage<AlarmDefine>>() {
                 });
                 List<AlarmDefine> definesList = AlarmDefineMessage.getContent();
+                log.info("接收到全量报警定义消息，共{}条", definesList == null ? 0 : definesList.size());
                 if (CollectionUtil.isNotEmpty(definesList)) {
                     try {
                         LockUtil.getInstance().lock.lock();
@@ -153,6 +151,7 @@ public class GroupNettyClientHandler extends ChannelInboundHandlerAdapter {
                         //加个等待，保证正在执行的逻辑执行成功
                         Thread.sleep(4000);
                         alarmDefineService.listAllAlarmDefine(definesList);
+                        log.info("全量报警定义存入内存完成");
                         LockUtil.getInstance().setExecute(true);
                         LockUtil.getInstance().condition.signalAll();
                     } catch (Exception e) {
@@ -175,9 +174,9 @@ public class GroupNettyClientHandler extends ChannelInboundHandlerAdapter {
                 if (CollectionUtil.isNotEmpty(definesList)) {
                     alarmDefineService.deleteAlarmDefine(definesList);
                 }
-            }else if (message.getOpCode() == 8) {
+            } else if (message.getOpCode() == 8) {
                 log.info("云端完成报警记录创建");
-                log.info("返回报警记录id[{}]",message);
+                log.info("返回报警记录id[{}]", message);
                 //{"id":"","objId":"","itemCode":""}  id为报警记录ID
 
                 List content = message.getContent();