From e9a5f5c065e7232e9d5ca1f2a4948d2f8e6e0c03 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 27 四月 2025 09:29:25 +0800
Subject: [PATCH] 米多泉州wcs开发完成

---
 src/main/java/com/zy/core/thread/BarcodeThread.java |  126 +++++++++--------------------------------
 1 files changed, 28 insertions(+), 98 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index b8710a6..f8b7317 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -1,18 +1,16 @@
 package com.zy.core.thread;
 
+import com.alibaba.fastjson.JSONObject;
 import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.zy.utils.News;
 import com.zy.core.Slave;
 import com.zy.core.ThreadHandler;
+import com.zy.core.cache.OutputQueue;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
+import java.util.Date;
 
 /**
  * 鏉＄爜鎵弿浠嚎绋�
@@ -23,115 +21,47 @@
 public class BarcodeThread implements Runnable, ThreadHandler {
 
     private Slave slave;
-    private String barcode;
-    private Socket socket;
-    private DataOutputStream dataOutputStream;
-    private DataInputStream dataInputStream;
+    private StringBuffer barcode = new StringBuffer();
+
+    private String lastBarcode = "";
 
     public BarcodeThread(Slave slave) {
         this.slave = slave;
     }
 
-    @Override
-    @SuppressWarnings("InfiniteLoopStatement")
-    public void run() {
-        connect();
-        while (true) {
-            try {
-                byte[] read = read(8, 100);
-                if (null != read) {
-                    String s = new String(read);
-                    if (!Cools.isEmpty(s)) {
-                        barcode = new String(read);
-                        log.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
-                    }
-                }
-                Thread.sleep(100);
-            } catch (SocketTimeoutException ignore) {
-            } catch (Exception e) {
-//                e.printStackTrace();
+    public String getBarcode() {
+        return barcode.toString();
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode.delete(0, this.barcode.length());
+        this.barcode.append(barcode);
+        if(!Cools.isEmpty(barcode) && !lastBarcode.equals(barcode)) {
+            News.info("Barcode"+" - 1"+" - {}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
+            lastBarcode = 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);
         }
     }
 
     @Override
     public boolean connect() {
-        try {
-            close();  //1.涓诲姩閲婃斁杩炴帴 //2.鏌愪簺鏈嶅姟鍣ㄥ鎸囧畾ip鏈夐摼璺暟闄愬埗
-            socket = new Socket();
-            //socket.setKeepAlive(true);
-            SocketAddress socketAddress = new InetSocketAddress(slave.getIp(), slave.getPort());
-            socket.connect(socketAddress, 1000); //鏌愪簺鏈嶅姟鍣╬ing寤惰繜楂樻椂瑕佸鍔�,鍚﹀垯浼氭姤閿檆onnect timeout
-            dataOutputStream = new DataOutputStream(socket.getOutputStream());
-            dataInputStream = new DataInputStream(socket.getInputStream());
-//            log.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-        } catch (Exception e) {
-            socket = null;
-            log.error("鏉＄爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-            return false;
-        }
-        return true;
+        return false;
     }
 
     @Override
     public void close() {
-        try {
-            if (null != dataOutputStream) {
-                dataOutputStream.close();
-            }
-            if (null != dataInputStream) {
-                dataInputStream.close();
-            }
-//        if (null != socket && !socket.isClosed()) {
-//            socket.close();
-//        }
-            if (null != socket){
-                socket.close();
-            }
-            socket = null;
-        } catch (IOException e) {
-            log.error("SocketClient close Exception:" + e.getMessage());
-        }
+
     }
 
-    public void write(byte[] msg, int len) throws IOException {
-        if (null != dataInputStream)
-        {
-            dataOutputStream.write(msg, 0, len);
-            dataOutputStream.flush();
-        }
-    }
+    @Override
+    public void run() {
 
-    public byte[] read(int bufferSize, int timeOut) throws IOException {
-//        if (socket == null) {
-//           connect();
-//        }
-        connect();
-        socket.setSoTimeout(timeOut);
-        byte[] bytes = new byte[bufferSize];
-        int len = dataInputStream.read(bytes);
-        byte[] tempBytes = null;
-        if (len > 0) {
-            tempBytes = new byte[len];
-            System.arraycopy(bytes, 0, tempBytes, 0, len);
-        }
-        return tempBytes;
-    }
-
-    public boolean valid() throws Exception {
-        if (null == socket || socket.isClosed() || socket.isInputShutdown() || socket.isOutputShutdown()) {
-            if (dataInputStream != null) {
-                dataInputStream.close();
-            }
-            if (dataOutputStream != null) {
-                dataOutputStream.close();
-            }
-            if (socket != null) {
-                socket.close();
-            }
-            return false;
-        }
-        return true;
     }
 
 }

--
Gitblit v1.9.1