#

luxiaotao1123

2022-07-30 cb3cbeba7b17deb777e9866b4718bb41527c3b37

 src/main/java/com/zy/core/netty/handle/PackageServerHandler.java

@@ -1,20 +1,14 @@
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.zy.core.netty.AbstractInboundHandler;
import com.zy.core.netty.cache.ChannelCache;
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;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

/**
@@ -26,29 +20,19 @@
@ChannelHandler.Sharable
public class PackageServerHandler extends AbstractInboundHandler<ChPackage> {

    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private TcpProperties tcpProperties;

    @Override
    protected boolean channelRead0(ChannelHandlerContext ctx, ChPackage pac) {
//        log.info("读码器【IP:{}】 上行数据 ===>> {}", 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());
                break;
            case FIRE_ALARM:
                break;
            default:
                break;
        }
        return true;
    }