|
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.TypeReference;
|
|
|
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;
|
|
|
import com.persagy.utils.LockUtil;
|
|
@@ -17,6 +18,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 java.util.Arrays;
|
|
|
import java.util.List;
|
|
@@ -81,6 +83,21 @@ public class GroupNettyClientHandler extends ChannelInboundHandlerAdapter {
|
|
|
nettyMessage.setContent(Arrays.asList(content));
|
|
|
log.info(nettyMessage.toString());
|
|
|
ctx.channel().writeAndFlush(nettyMessage.toString());
|
|
|
+ iniAlarmResult(ctx);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void iniAlarmResult(ChannelHandlerContext ctx) {
|
|
|
+ try {
|
|
|
+ log.info("--initAlarmResult--");
|
|
|
+ String msg = NettyMessageQueue.getNettyMessageQueue().consume();
|
|
|
+ while (StringUtils.isNotBlank(msg)){
|
|
|
+ log.info("剩余报警消息令总数:{}",NettyMessageQueue.getNettyMessageQueue().size());
|
|
|
+ ctx.writeAndFlush(msg);
|
|
|
+ msg = NettyMessageQueue.getNettyMessageQueue().consume();
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("发送报警消息失败",e);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|