From a2d6371396f74e4fb30a4c79e91c6b371a77d0b5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 22 十一月 2024 20:54:07 +0800
Subject: [PATCH] #读取地图文件优化
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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..3b9c31b 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -75,6 +75,8 @@
private RedisUtil redisUtil;
@Value("${super.pwd}")
private String superPwd;
+ @Autowired
+ private NavigateMapData navigateMapData;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -313,6 +315,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);
+ }
+
/**
* 鑾峰彇鍦板浘鏁版嵁
*/
@@ -327,7 +342,7 @@
BasMap basMap = JSON.parseObject(data.toString(), BasMap.class);
//瑙ｆ瀽json鍦板浘鏁版嵁
ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
- NavigateMapData navigateMapData = new NavigateMapData(lev);
+ navigateMapData.setLev(lev);
List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
return R.ok().add(lists);
}
@@ -352,8 +367,6 @@
}
br.close();
}
-
- NavigateMapData navigateMapData = new NavigateMapData();
//瑙ｆ瀽json鍦板浘鏁版嵁
ArrayList arrayList = JSON.parseObject(stringBuffer.toString(), ArrayList.class);
@@ -385,8 +398,8 @@
for (int i = 1; i <= 10; i++) {//鎬诲叡10灞傛ゼ
BasMap basMap = basMapService.selectLatestMap(i);
//杞藉叆鍦板浘
- NavigateMapData mapData = new NavigateMapData(i);
- List<List<MapNode>> lists = mapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+ navigateMapData.setLev(i);
+ List<List<MapNode>> lists = navigateMapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
if (basMap == null) {
//鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
//瀛樺叆鏁版嵁搴�
@@ -434,8 +447,8 @@
BasMap basMap = basMapService.selectLatestMap(lev);
//杞藉叆鍦板浘
- NavigateMapData mapData = new NavigateMapData(lev);
- List<List<MapNode>> lists = mapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+ navigateMapData.setLev(lev);
+ List<List<MapNode>> lists = navigateMapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
if (basMap == null) {
//鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
//瀛樺叆鏁版嵁搴�
--
Gitblit v1.9.1