From e9472e68debf0e1772e0fe88e24c790c94411560 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 16 十一月 2023 10:20:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 155 ++++++---------------------------------------------
1 files changed, 20 insertions(+), 135 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 2bca652..39cd3c3 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -3,19 +3,12 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.zy.common.utils.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
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;
/**
@@ -27,151 +20,43 @@
public class BarcodeThread implements Runnable, ThreadHandler {
private Slave slave;
- private String barcode = "";
- private Socket socket;
- private DataOutputStream dataOutputStream;
- private DataInputStream dataInputStream;
+ private StringBuffer barcode = new StringBuffer();
public BarcodeThread(Slave slave) {
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璇诲彇鏉＄爜鏁版嵁澶勭悊鏂瑰紡------------------------------
+ public String getBarcode() {
+ return barcode.toString();
+ }
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- connect();
- while (true) {
- try {
- byte[] read = read(50, 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);
- }
- }else{
- barcode = "";
- }
- Thread.sleep(50);
- } catch (SocketTimeoutException ignore) {
-// barcode="";
- } catch (Exception e) {
- barcode="";
-// e.printStackTrace();
+ 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);
}
}
@Override
public boolean connect() {
- 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());
- 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;
+ return false;
}
@Override
public void close() {
- try {
- if (null != dataOutputStream) {
- 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());
- }
+
}
- public void write(byte[] msg, int len) throws IOException {
- if (null != dataInputStream)
- {
- dataOutputStream.write(msg, 0, len);
- dataOutputStream.flush();
- }
- }
+ @Override
+ public void run() {
- public byte[] read(int bufferSize, int timeOut) throws IOException {
- 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);
- } 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