From 8d3177533e3cc19bc83bd1d2258783e44d082db2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 02 八月 2022 16:43:07 +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 | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 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 9c9f4fa..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,10 +1,12 @@
package com.zy.core.netty.handle;
+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.netty.domain.fire.Fire_3030;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
@@ -22,31 +24,26 @@
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) {
- byte[] bytes = pac.getBytes();
- System.out.println("瀹㈡埛绔柇寮�===>>" + new String(bytes, 0, bytes.length));
+ 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();
-// 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;
-// }
-// }
-// }
+ ChannelCache.setChannel(String.valueOf(fire3030.getNo()), ctx.channel());
+ Constant.errorMap.remove(fire3030.getNo());
+ break;
+ case FIRE_ALARM:
+ break;
+ default:
+ break;
+ }
return true;
}
--
Gitblit v1.9.1