From 7f4f3cab444ff87570b9f883e0dadeecf6199147 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 20 二月 2023 14:02:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 23 +++++++++++++++++++++++
src/main/java/com/zy/core/ServerBootstrap.java | 5 ++++-
2 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 7b7e6e0..062a29f 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -92,7 +92,10 @@
log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
for (Slave barcode : slaveProperties.getBarcode()) {
BarcodeThread barcodeThread = new BarcodeThread(barcode);
- new Thread(barcodeThread).start();
+ if(barcode.getId() > 6)
+ {//1鍒�6鍙锋壂鐮佸櫒鏁版嵁浠嶱LC涓幏鍙栵紝鏃犻渶start
+ new Thread(barcodeThread).start();
+ }
SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
}
// 鍒濆鍖朙ED绾跨▼
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 18202bd..53b8d97 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -36,6 +36,29 @@
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() {
--
Gitblit v1.9.1