From 8dc3bcb40363cc6f9281092b4f6ea0ebcb9335b0 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 07 二月 2024 11:27:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/BarcodeThread.java |   96 ++++++++++++++++++++++-------------------------
 1 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index ca2783d..fe43a35 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
+import com.zy.core.News;
 import com.zy.core.Slave;
 import com.zy.core.ThreadHandler;
 import com.zy.core.cache.OutputQueue;
@@ -27,38 +28,32 @@
 public class BarcodeThread implements Runnable, ThreadHandler {
 
     private Slave slave;
-    private String barcode;
+    private StringBuffer barcode = new StringBuffer();
     private Socket socket;
     private DataOutputStream dataOutputStream;
     private DataInputStream dataInputStream;
+    public Integer connCount = 0;
 
     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);
-                        JSONObject jsonObject = new JSONObject();
-                        jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
-                        jsonObject.put("barcode", barcode);
-                        OutputQueue.BARCODE.offer(jsonObject);
-                    }
-                }
-                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)) {
+            News.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);
         }
     }
 
@@ -67,7 +62,6 @@
         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());
@@ -90,9 +84,6 @@
             if (null != dataInputStream) {
                 dataInputStream.close();
             }
-//        if (null != socket && !socket.isClosed()) {
-//            socket.close();
-//        }
             if (null != socket){
                 socket.close();
             }
@@ -102,19 +93,35 @@
         }
     }
 
-    public void write(byte[] msg, int len) throws IOException {
-        if (null != dataInputStream)
-        {
-            dataOutputStream.write(msg, 0, len);
-            dataOutputStream.flush();
+    @Override
+    @SuppressWarnings("InfiniteLoopStatement")
+    public void run() {
+        connect();
+        while (true) {
+            try {
+                byte[] read = read(14, 5000);
+                if (null != read) {
+                    String s = new String(read);
+                    if (!Cools.isEmpty(s)) {
+                        setBarcode(new String(read));
+                    }
+                }
+                Thread.sleep(50);
+            } catch (SocketTimeoutException ignore) {
+                connCount++;
+            } catch (Exception e) {
+                setBarcode("");
+                e.printStackTrace();
+            }
         }
     }
 
     public byte[] read(int bufferSize, int timeOut) throws IOException {
-//        if (socket == null) {
-//           connect();
-//        }
-        connect();
+        if (socket == null || !socket.isConnected() || socket.isClosed() || connCount > 120) {
+            connect();
+            connCount = 0;
+            return null;
+        }
         socket.setSoTimeout(timeOut);
         byte[] bytes = new byte[bufferSize];
         int len = dataInputStream.read(bytes);
@@ -122,24 +129,11 @@
         if (len > 0) {
             tempBytes = new byte[len];
             System.arraycopy(bytes, 0, tempBytes, 0, len);
+        } else {
+            connect();
         }
         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