From d1db7fc8d9726687f554b58cc48bbe063bcc28b4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 20 三月 2023 15:53:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 103 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 68 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 2380348..d0b775e 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -1,7 +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;
@@ -11,6 +15,8 @@
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
+import java.util.Date;
/**
* 鏉＄爜鎵弿浠嚎绋�
@@ -21,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;
@@ -30,20 +36,54 @@
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 {
- write("T".getBytes(), "T".length());
- byte[] read = read(11, 1000);
+ byte[] read = read(16, 200);
if (null != read) {
- barcode = new String(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(1000);
+ Thread.sleep(50);
+ } catch (SocketTimeoutException ignore) {
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
}
@@ -58,9 +98,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;
@@ -68,22 +109,23 @@
@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 {
@@ -95,18 +137,19 @@
}
public byte[] read(int bufferSize, int timeOut) throws IOException {
- if (socket == null) {
- return null;
+ if (socket == null || !socket.isConnected() || socket.isClosed()) {
+ connect();
}
- socket.setSoTimeout(timeOut * 1000);
+// 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);
+ } else {
+ connect();
}
return tempBytes;
}
@@ -127,14 +170,4 @@
return true;
}
- public static void main(String[] args) throws Exception {
- BarcodeThread barcodeThread = new BarcodeThread(new Slave());
- barcodeThread.getSlave().setIp("192.168.2.150");
- barcodeThread.getSlave().setPort(51236);
- boolean connect = barcodeThread.connect();
- System.out.println(connect);
- barcodeThread.write("T".getBytes(), "T".length());
- byte[] read = barcodeThread.read(11, 1000);
- System.out.println(new String(read));
- }
}
--
Gitblit v1.9.1