From 1d871b3618f229c543725949f05bf24293a34319 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 22 二月 2022 14:18:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/BarcodeThread.java         |    7 +++++--
 src/main/java/com/zy/asrs/controller/ConsoleController.java |   19 +++++++++++++++++--
 src/main/java/com/zy/core/cache/OutputQueue.java            |    4 +++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 43336a3..6379d35 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.core.annotations.ManagerAuth;
 import com.core.common.Arith;
 import com.core.common.Cools;
@@ -15,7 +16,9 @@
 import com.zy.asrs.service.WrkMastService;
 import com.zy.common.CodeRes;
 import com.zy.core.CrnThread;
+import com.zy.core.DevpThread;
 import com.zy.core.Slave;
+import com.zy.core.cache.OutputQueue;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.CrnModeType;
 import com.zy.core.enums.SlaveType;
@@ -26,9 +29,8 @@
 import com.zy.core.properties.SlaveProperties;
 import com.zy.core.properties.SystemProperties;
 import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.ScaleThread;
 import com.zy.core.thread.MelsecCrnThread;
-import com.zy.core.DevpThread;
+import com.zy.core.thread.ScaleThread;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -280,4 +282,17 @@
         return R.ok();
     }
 
+    @PostMapping("/barcode/output/site")
+    public R crnOutput(){
+//        StringBuilder str = new StringBuilder();
+//        String s;
+//        int i = 0;
+//        while((s = OutputQueue.CRN.poll()) != null && i <=32) {
+//            str.append("\n").append(s);
+//            i++;
+//        }
+//        return R.ok().add(str.toString());
+        return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
+    }
+
 }
diff --git a/src/main/java/com/zy/core/cache/OutputQueue.java b/src/main/java/com/zy/core/cache/OutputQueue.java
index 9b725b3..63205e7 100644
--- a/src/main/java/com/zy/core/cache/OutputQueue.java
+++ b/src/main/java/com/zy/core/cache/OutputQueue.java
@@ -1,5 +1,7 @@
 package com.zy.core.cache;
 
+import com.alibaba.fastjson.JSONObject;
+
 import java.util.concurrent.ArrayBlockingQueue;
 
 /**
@@ -12,5 +14,5 @@
     // 杈撻�佺嚎杈撳嚭鏃ュ織
     public static ArrayBlockingQueue<String> DEVP = new ArrayBlockingQueue<>(32);
     // 鏉$爜鍣ㄨ緭鍑烘棩蹇�
-    public static ArrayBlockingQueue<String> BARCODE = new ArrayBlockingQueue<>(32);
+    public static ArrayBlockingQueue<JSONObject> 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 6623a1a..ca2783d 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,10 @@
                     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);
+                        OutputQueue.BARCODE.offer(jsonObject);
                     }
                 }
                 Thread.sleep(100);

--
Gitblit v1.9.1