From 7603004d9eed2904a823861e7cd6f5c2f0016500 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 04 三月 2024 16:19:03 +0800
Subject: [PATCH] #条码显示
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index f450cd2..e56629c 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -313,6 +313,18 @@
return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
}
+ @GetMapping("/barcode/list")
+ public R barcodeList(){
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (Slave slave : slaveProperties.getBarcode()) {
+ HashMap<String, Object> map = new HashMap<>();
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId());
+ map.put("id", slave.getId());
+ map.put("barcode", barcodeThread.getBarcode());
+ }
+ return R.ok().add(list);
+ }
+
/**
* 鑾峰彇鍦板浘鏁版嵁
*/
--
Gitblit v1.9.1