From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 79 +--------------------------------------
1 files changed, 2 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index b9b451e..2850e0f 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -9,14 +9,6 @@
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;
/**
@@ -29,10 +21,6 @@
private Slave slave;
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;
@@ -47,9 +35,11 @@
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);
+ jsonObject.put("id", slave.getId());
if (OutputQueue.BARCODE.size() >= 32) {
OutputQueue.BARCODE.poll();
}
@@ -59,81 +49,16 @@
@Override
public boolean connect() {
- try {
- close(); //1.涓诲姩閲婃斁杩炴帴 //2.鏌愪簺鏈嶅姟鍣ㄥ鎸囧畾ip鏈夐摼璺暟闄愬埗
- socket = new Socket();
- 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;
}
@Override
public void close() {
- try {
- if (null != dataOutputStream) {
- dataOutputStream.close();
- }
- if (null != dataInputStream) {
- dataInputStream.close();
- }
- if (null != socket){
- socket.close();
- }
- socket = null;
- } catch (IOException e) {
- log.error("SocketClient close Exception:" + e.getMessage());
- }
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- connect();
- while (true) {
- try {
- byte[] read = read(14, 15000);
- if (null != read) {
- String s = new String(read);
- if (!Cools.isEmpty(s)) {
- setBarcode(new String(read));
- }
- }
- Thread.sleep(50);
- }catch (Exception e) {
- setBarcode("");
- log.error("run" + e);
-// e.printStackTrace();
- connect();
- }
- }
}
-
- public byte[] read(int bufferSize, int timeOut) throws IOException {
- 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);
- byte[] tempBytes = null;
- if (len > 0) {
- tempBytes = new byte[len];
- System.arraycopy(bytes, 0, tempBytes, 0, len);
- } else {
- connect();
- }
- return tempBytes;
- }
-
}
--
Gitblit v1.9.1