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

Junjie

2024-11-22 bb748f7f3dc15af31953a20200b1564fb77bfd7a

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

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

@@ -116,15 +116,17 @@
        connect();
        while (true) {
            try {
                byte[] read = read(14, 15000);
                byte[] read = read(14, 3 * 60 * 1000);
                if (null != read) {
                    String s = new String(read);
                    log.warn("ip:{},id:{},读取到条码：{}",slave.getIp(),slave.getId(),s);
                    if (!Cools.isEmpty(s)) {
                        setBarcode(new String(read));
                    }
                }
                Thread.sleep(50);
            }catch (Exception e) {
                log.warn("ip:{},id:{},读取条码异常：{}",slave.getIp(),slave.getId(),e);
                setBarcode("");
                log.error("run" + e);
//                e.printStackTrace();