Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs

whycq

2023-02-14 d39480501976a24d3749048e728e80cb1d01145b

 src/main/java/com/zy/core/thread/BarcodeThread.java

@@ -1,8 +1,11 @@
package com.zy.core.thread;

import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.OutputQueue;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

@@ -13,6 +16,7 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
import java.util.Date;

/**
 * 条码扫描仪线程
@@ -38,15 +42,22 @@
        connect();
        while (true) {
            try {
                byte[] read = read(8, 100);
                byte[] read = read(8, 200);
                if (null != read) {
                    String s = new String(read);
                    if (!Cools.isEmpty(s)) {
                        barcode = new String(read);
                        log.info("{}号条码器，检索数据：{}", slave.getId(), this.barcode);
                        JSONObject jsonObject = new JSONObject();
                        jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
                        jsonObject.put("barcode", barcode);
                        if (OutputQueue.BARCODE.size() >= 32) {
                            OutputQueue.BARCODE.poll();
                        }
                        OutputQueue.BARCODE.offer(jsonObject);
                    }
                }
                Thread.sleep(100);
                Thread.sleep(50);
            } catch (SocketTimeoutException ignore) {
            } catch (Exception e) {
//                e.printStackTrace();
@@ -103,10 +114,10 @@
    }

    public byte[] read(int bufferSize, int timeOut) throws IOException {
//        if (socket == null) {
//           connect();
//        }
        connect();
        if (socket == null || !socket.isConnected() || socket.isClosed()) {
            connect();
        }
//        connect();
        socket.setSoTimeout(timeOut);
        byte[] bytes = new byte[bufferSize];
        int len = dataInputStream.read(bytes);
@@ -114,6 +125,8 @@
        if (len > 0) {
            tempBytes = new byte[len];
            System.arraycopy(bytes, 0, tempBytes, 0, len);
        } else {
            connect();
        }
        return tempBytes;
    }