From 96838eab6a7da7b12f4623aa6e86f16f26bcdde4 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 09 一月 2023 14:27:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/BarcodeThread.java |   57 +++++++++++++++++++++++++++------------------------------
 1 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 5974a9a..00ffb2a 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -1,11 +1,15 @@
 package com.zy.core.thread;
 
-import HslCommunication.Core.Types.OperateResult;
-import HslCommunication.Enthernet.SimplifyNet.NetSimplifyClient;
+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;
+
+import java.util.Date;
 
 /**
  * 鏉$爜鎵弿浠嚎绋�
@@ -16,41 +20,34 @@
 public class BarcodeThread implements Runnable, ThreadHandler {
 
     private Slave slave;
-    private String barcode;
-    private NetSimplifyClient netSimplifyClient;
+    private StringBuffer barcode = new StringBuffer();
 
     public BarcodeThread(Slave slave) {
         this.slave = slave;
-        connect();
     }
 
-    @Override
-    @SuppressWarnings("InfiniteLoopStatement")
-    public void run() {
-        while (true) {
-            try {
-//                Task task = MessageQueue.poll(SlaveType.Barcode, slave.getId());
-                barcode = "10001136";
-                Thread.sleep(3000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+    public String getBarcode() {
+        return barcode.toString();
+    }
 
+    public void setBarcode(String barcode) {
+        this.barcode.delete(0, this.barcode.length());
+        this.barcode.append(barcode);
+        if(!Cools.isEmpty(barcode)) {
+            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);
         }
     }
 
     @Override
     public boolean connect() {
-        boolean result = false;
-        netSimplifyClient = new NetSimplifyClient(slave.getIp(), slave.getPort());
-        OperateResult connect = netSimplifyClient.ConnectServer();
-        if (connect.IsSuccess) {
-            result = true;
-            log.info("鏉$爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-        } else {
-            log.info("鏉$爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-        }
-        return result;
+        return false;
     }
 
     @Override
@@ -58,9 +55,9 @@
 
     }
 
-    public static void main(String[] args) {
-        BarcodeThread barcodeThread = new BarcodeThread();
-        boolean connect = barcodeThread.connect();
-        System.out.println(connect);
+    @Override
+    public void run() {
+
     }
+
 }

--
Gitblit v1.9.1