From 9d924eb9c66c509a379182b2abf5aa87baeaa8ad Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 21 二月 2022 15:47:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 5 +++++
src/main/java/com/zy/core/cache/OutputQueue.java | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/cache/OutputQueue.java b/src/main/java/com/zy/core/cache/OutputQueue.java
index d4881e9..9b725b3 100644
--- a/src/main/java/com/zy/core/cache/OutputQueue.java
+++ b/src/main/java/com/zy/core/cache/OutputQueue.java
@@ -11,5 +11,6 @@
public static ArrayBlockingQueue<String> CRN = new ArrayBlockingQueue<>(32);
// 杈撻�佺嚎杈撳嚭鏃ュ織
public static ArrayBlockingQueue<String> DEVP = new ArrayBlockingQueue<>(32);
-
+ // 鏉＄爜鍣ㄨ緭鍑烘棩蹇�
+ public static ArrayBlockingQueue<String> BARCODE = new ArrayBlockingQueue<>(32);
}
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index b8710a6..6623a1a 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -1,8 +1,10 @@
package com.zy.core.thread;
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;
@@ -13,6 +15,8 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
+import java.text.MessageFormat;
+import java.util.Date;
/**
* 鏉＄爜鎵弿浠嚎绋�
@@ -44,6 +48,7 @@
if (!Cools.isEmpty(s)) {
barcode = new String(read);
log.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
}
}
Thread.sleep(100);
--
Gitblit v1.9.1