From cb0ff9f2bb40237c714ad6af6175f71809f1b2d4 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 02 八月 2022 14:50:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 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 fc7f7a5..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,15 +1,13 @@
package com.zy.core.netty.handle;
-import com.core.common.Cools;
-import com.zy.core.Slave;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
+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.properties.TcpProperties;
-import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.BarcodeThread;
+import com.zy.core.netty.domain.fire.Fire_3030;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
@@ -27,28 +25,25 @@
public class PackageServerHandler extends AbstractInboundHandler<ChPackage> {
@Autowired
- private SlaveProperties slaveProperties;
- @Autowired
- private TcpProperties tcpProperties;
+ private MainServiceImpl mainService;
@Override
protected boolean channelRead0(ChannelHandlerContext ctx, ChPackage pac) {
-// log.info("璇荤爜鍣ㄣ�怚P:{}銆� 涓婅鏁版嵁 ===>> {}", pac.getIp(), pac.getAscii());
-// //鎵爜涓婁紶鏁版嵁鏍煎紡蹇呴』2涓�#寮�澶达紝濡�:##12345678
-// String msg = pac.getAscii().replaceAll("#", "");
-// if(!Cools.isEmpty(msg) && msg.length()>=tcpProperties.getBarcodeLen()){
-// msg = msg.substring(0,tcpProperties.getBarcodeLen());
-//
-// for (Slave slave : slaveProperties.getBarcode()) {
-// if (slave.getIp().equals(pac.getIp())) {
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId());
-// if (barcodeThread == null) { continue; }
-// barcodeThread.setBarcode(msg);
-// break;
-// }
-// }
-// }
+ FireDataType dataType = FireDataType.get(pac.getBytes()[1], pac.getBytes()[2]);
+ 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;
+ }
return true;
}
--
Gitblit v1.9.1