From e3d610181add28342467df017450fe2b87101e2a Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 02 八月 2022 15:08:11 +0800
Subject: [PATCH] Merge branch 'gzynwcs' of http://47.97.1.152:5880/r/zy-wcs into gzynwcs
---
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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:
--
Gitblit v1.9.1