From fb5b2e35fd234d8f8068c690df1bcbf956e05880 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 03 十一月 2020 09:35:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/BarcodeThread.java |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 876c826..7c613d7 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -1,5 +1,6 @@
 package com.zy.core.thread;
 
+import com.core.common.Cools;
 import com.zy.core.Slave;
 import com.zy.core.ThreadHandler;
 import lombok.Data;
@@ -28,18 +29,20 @@
 
     public BarcodeThread(Slave slave) {
         this.slave = slave;
-        connect();
     }
 
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
+        connect();
         while (true) {
             try {
                 write("T".getBytes(), "T".length());
                 byte[] read = read(11, 1000);
-                barcode = new String(read);
-                Thread.sleep(1000);
+                if (null != read) {
+                    barcode = new String(read);
+                }
+                Thread.sleep(100);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -56,9 +59,10 @@
             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("socket connect error ip:");
+            log.error("鏉＄爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
             return false;
         }
         return true;
@@ -66,7 +70,6 @@
 
     @Override
     public void close() {
-        log.debug("Entry Method:close()");
         try {
             if (null != dataOutputStream) {
             dataOutputStream.close();
@@ -81,22 +84,23 @@
         } catch (IOException e) {
             log.error("SocketClient close Exception:" + e.getMessage());
         }
-        log.debug("Exit Method:close()");
     }
 
     public void write(byte[] msg, int len) throws IOException {
-        log.trace("dataOutputStream.write");
-        dataOutputStream.write(msg, 0, len);
-        log.trace("dataOutputStream.flush");
-        dataOutputStream.flush();
+        if (null != dataInputStream)
+        {
+            dataOutputStream.write(msg, 0, len);
+            dataOutputStream.flush();
+        }
     }
 
     public byte[] read(int bufferSize, int timeOut) throws IOException {
+        if (socket == null) {
+            return null;
+        }
         socket.setSoTimeout(timeOut * 1000);
         byte[] bytes = new byte[bufferSize];
-        log.trace("dataInputStream.read");
         int len = dataInputStream.read(bytes);
-        log.debug("readLen:" + len);
         byte[] tempBytes = null;
         if (len > 0) {
         tempBytes = new byte[len];
@@ -121,6 +125,16 @@
         return true;
     }
 
+    public String getBarcode() {
+        if (Cools.isEmpty(barcode)) {
+            return null;
+        } else if("NG".endsWith(barcode)) {
+            return null;
+        } else  {
+            return barcode.trim();
+        }
+    }
+
     public static void main(String[] args) throws Exception {
         BarcodeThread barcodeThread = new BarcodeThread(new Slave());
         barcodeThread.getSlave().setIp("192.168.2.150");

--
Gitblit v1.9.1