From afe777a76ae3448a53986aac22b3a667a21c64c7 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期五, 18 三月 2022 09:55:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmwcs' into xgmwcs
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 10 ++++++++--
1 files changed, 8 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 6623a1a..d82420a 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -1,5 +1,6 @@
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;
@@ -15,7 +16,6 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
-import java.text.MessageFormat;
import java.util.Date;
/**
@@ -48,7 +48,13 @@
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()));
+ 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(100);
--
Gitblit v1.9.1