From 8c3e80c58712925d4df78d649743cda61c6131d0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 01 八月 2022 16:56:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/netty/constant/Constant.java | 4 ++++
src/main/java/com/zy/core/netty/handle/ProtectorHandler.java | 2 ++
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 4 ++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/netty/constant/Constant.java b/src/main/java/com/zy/core/netty/constant/Constant.java
index 233ae47..4ecf76c 100644
--- a/src/main/java/com/zy/core/netty/constant/Constant.java
+++ b/src/main/java/com/zy/core/netty/constant/Constant.java
@@ -4,6 +4,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* 閰嶇疆甯搁噺
@@ -16,4 +17,7 @@
public static final Charset CHARSET_GBK = Charset.forName("GBK");
public static Map<String, Date> FIRE_HEARTBEAT = new HashMap<>();
+
+ public static Map<Integer, String> errorMap = new ConcurrentHashMap<>();
+
}
diff --git a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
index 403643e..ca6e11b 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -1,6 +1,5 @@
package com.zy.core.netty.handle;
-import com.core.common.DateUtils;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.netty.AbstractInboundHandler;
import com.zy.core.netty.cache.ChannelCache;
@@ -36,7 +35,8 @@
String now = "20" + fire3030.getYear() + "-" + fire3030.getMonth() + "-" + fire3030.getDay()
+ " " + fire3030.getHour() + ":" + fire3030.getMinute() + ":" + fire3030.getSeconds();
- Constant.FIRE_HEARTBEAT.put(fire3030.getNo().toString(), DateUtils.convert(now));
+ ChannelCache.setChannel(String.valueOf(fire3030.getNo()), ctx.channel());
+ Constant.errorMap.remove(fire3030.getNo());
break;
case FIRE_ALARM:
diff --git a/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java b/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java
index add63dd..e48310c 100644
--- a/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java
@@ -3,6 +3,7 @@
import com.core.common.Cools;
import com.zy.core.netty.AbstractInboundHandler;
import com.zy.core.netty.cache.ChannelCache;
+import com.zy.core.netty.constant.Constant;
import com.zy.core.netty.domain.ChPackage;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
@@ -39,6 +40,7 @@
ctx.close();
if (!Cools.isEmpty(uuid)){
log.info("uuid={} 绌洪棽鍓旈櫎", uuid);
+ Constant.errorMap.put(Integer.parseInt(uuid), "鏂紑寮傚父");
}
}
}
--
Gitblit v1.9.1