From fc08466bbe495a363ac840f93511d970715c504e Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 21 二月 2022 13:17:23 +0800
Subject: [PATCH] #css 修改176

---
 src/main/java/com/zy/core/thread/BarcodeThread.java |   77 ++++++++++++++++++++------------------
 1 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index ee050f7..b8710a6 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -1,6 +1,6 @@
 package com.zy.core.thread;
 
-import HslCommunication.BasicFramework.SoftBasic;
+import com.core.common.Cools;
 import com.zy.core.Slave;
 import com.zy.core.ThreadHandler;
 import lombok.Data;
@@ -12,6 +12,7 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
 
 /**
  * 鏉＄爜鎵弿浠嚎绋�
@@ -29,20 +30,26 @@
 
     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);
+                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();
+//                e.printStackTrace();
             }
         }
     }
@@ -57,9 +64,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;
@@ -67,41 +75,45 @@
 
     @Override
     public void close() {
-        log.debug("Entry Method:close()");
         try {
             if (null != dataOutputStream) {
-            dataOutputStream.close();
-        }
-        if (null != dataInputStream) {
-            dataInputStream.close();
-        }
-        if (null != socket && !socket.isClosed()) {
-          socket.close();
-        }
-        socket = null;
+                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());
         }
-        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 {
-        socket.setSoTimeout(timeOut * 1000);
+//        if (socket == null) {
+//           connect();
+//        }
+        connect();
+        socket.setSoTimeout(timeOut);
         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];
-        System.arraycopy(bytes, 0, tempBytes, 0, len);
+            tempBytes = new byte[len];
+            System.arraycopy(bytes, 0, tempBytes, 0, len);
         }
         return tempBytes;
     }
@@ -122,13 +134,4 @@
         return true;
     }
 
-    public static void main(String[] args) throws Exception {
-        BarcodeThread barcodeThread = new BarcodeThread();
-        boolean connect = barcodeThread.connect();
-        System.out.println(connect);
-        barcodeThread.write("T".getBytes(), "T".length());
-        byte[] read = barcodeThread.read(11, 1000);
-        System.out.println(SoftBasic.ByteToHexString(read));
-        System.out.println(new String(read));
-    }
 }

--
Gitblit v1.9.1