From 60e04974768c2c98b839a085cce2579caf0f3864 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 16 三月 2023 11:15:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 18202bd..d0b775e 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -27,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;
@@ -36,13 +36,36 @@
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 {
- byte[] read = read(8, 200);
+ byte[] read = read(16, 200);
if (null != read) {
String s = new String(read);
if (!Cools.isEmpty(s)) {
--
Gitblit v1.9.1