From 3c665a261dcfeeee6a2637d69762f64854349f2f Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 01 八月 2022 16:36:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/netty/constant/Constant.java | 4 ++++
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 11 +++++++++++
2 files changed, 15 insertions(+), 0 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 d228f38..233ae47 100644
--- a/src/main/java/com/zy/core/netty/constant/Constant.java
+++ b/src/main/java/com/zy/core/netty/constant/Constant.java
@@ -1,6 +1,9 @@
package com.zy.core.netty.constant;
import java.nio.charset.Charset;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* 閰嶇疆甯搁噺
@@ -12,4 +15,5 @@
public static final Charset CHARSET_GBK = Charset.forName("GBK");
+ public static Map<String, Date> FIRE_HEARTBEAT = new HashMap<>();
}
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 3ebba0a..403643e 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -1,7 +1,10 @@
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;
+import com.zy.core.netty.constant.Constant;
import com.zy.core.netty.constant.FireDataType;
import com.zy.core.netty.domain.ChPackage;
import com.zy.core.netty.domain.fire.Fire_3030;
@@ -9,6 +12,7 @@
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
@@ -20,6 +24,8 @@
@ChannelHandler.Sharable
public class PackageServerHandler extends AbstractInboundHandler<ChPackage> {
+ @Autowired
+ private MainServiceImpl mainService;
@Override
protected boolean channelRead0(ChannelHandlerContext ctx, ChPackage pac) {
@@ -27,8 +33,13 @@
switch (dataType) {
case HEARTBEAT:
Fire_3030 fire3030 = new Fire_3030().readFromBytes(pac.getBytes());
+ 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));
break;
case FIRE_ALARM:
+
break;
default:
break;
--
Gitblit v1.9.1