From 21f24be124930874b04cf9678a7def716611cf2b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 23 二月 2023 14:11:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/BarcodeThread.java |   73 +++++++++++++++++++++++++++---------
 1 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index b34d7d4..45bb3cf 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/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;
 
 /**
  * 鏉＄爜鎵弿浠嚎绋�
@@ -23,7 +27,7 @@
 public class BarcodeThread implements Runnable, ThreadHandler {
 
     private Slave slave;
-    private String barcode;
+    private String barcode = "";
     private Socket socket;
     private DataOutputStream dataOutputStream;
     private DataInputStream dataInputStream;
@@ -32,20 +36,51 @@
         this.slave = slave;
     }
 
+//    // PLC璇诲彇鏉＄爜鏁版嵁澶勭悊鏂瑰紡, 1鍒�6鍙锋壂鐮佸櫒----------------------
+//    private StringBuffer barcodePlc = new StringBuffer();
+//
+//    public String getBarcodePlc() {
+//        return barcodePlc.toString();
+//    }
+//
+//    public void setBarcodePlc(String barcodePlc) {
+//        this.barcodePlc.delete(0, this.barcodePlc.length());
+//        this.barcodePlc.append(barcodePlc);
+//        if(!Cools.isEmpty(barcodePlc)) {
+//            log.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcodePlc);
+//            JSONObject jsonObject = new JSONObject();
+//            jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+//            jsonObject.put("barcode", barcodePlc);
+//            if (OutputQueue.BARCODE.size() >= 32) {
+//                OutputQueue.BARCODE.poll();
+//            }
+//            OutputQueue.BARCODE.offer(jsonObject);
+//        }
+//    }
+//    // PLC璇诲彇鏉＄爜鏁版嵁澶勭悊鏂瑰紡------------------------------
+
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
         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();
@@ -76,18 +111,18 @@
     public void close() {
         try {
             if (null != dataOutputStream) {
-            dataOutputStream.close();
-        }
-        if (null != dataInputStream) {
-            dataInputStream.close();
-        }
+                dataOutputStream.close();
+            }
+            if (null != dataInputStream) {
+                dataInputStream.close();
+            }
 //        if (null != socket && !socket.isClosed()) {
 //            socket.close();
 //        }
-        if (null != socket){
-            socket.close();
-        }
-        socket = null;
+            if (null != socket){
+                socket.close();
+            }
+            socket = null;
         } catch (IOException e) {
             log.error("SocketClient close Exception:" + e.getMessage());
         }
@@ -102,17 +137,19 @@
     }
 
     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);
         byte[] tempBytes = null;
         if (len > 0) {
-        tempBytes = new byte[len];
-        System.arraycopy(bytes, 0, tempBytes, 0, len);
+            tempBytes = new byte[len];
+            System.arraycopy(bytes, 0, tempBytes, 0, len);
+        } else {
+            connect();
         }
         return tempBytes;
     }

--
Gitblit v1.9.1