From 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 13 +++++++++++++
1 files changed, 13 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..372fd34 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -313,6 +313,19 @@
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());
+ list.add(map);
+ }
+ return R.ok().add(list);
+ }
+
/**
* 鑾峰彇鍦板浘鏁版嵁
*/
--
Gitblit v1.9.1