From 6694bb8752aced4b818f2976442d66ae3a52e9e8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 25 七月 2025 13:25:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 79 ++-------------------------------------
1 files changed, 4 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 8deec59..a91bc4c 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -202,10 +202,10 @@
lists = loadPathLock(lists, lev);
}
- if(mapType.equals(NavigationMapType.TRAFFIC_CONTROL)) {
- //鍔犺浇浜ら�氱鍒�
- lists = loadTrafficControl(lists, lev);
- }
+// if(mapType.equals(NavigationMapType.TRAFFIC_CONTROL)) {
+// //鍔犺浇浜ら�氱鍒�
+// lists = loadTrafficControl(lists, lev);
+// }
}
//鍔犺浇鐧藉悕鍗曡妭鐐�
@@ -444,77 +444,6 @@
lists.set(row, list);
}
}
-
-// HashMap<String, Integer> deviceMap = trafficControlThread.getDeviceMap();
-// if(deviceMap == null) {
-// throw new CoolException("get traffic control device map error");
-// }
-//
-// for (Map.Entry<String, Integer> entry : deviceMap.entrySet()) {
-// String key = entry.getKey();
-// Integer shuttleNo = entry.getValue();
-// if (shuttleNo <= 0) {
-// continue;
-// }
-//
-// Object object = redisUtil.get(RedisKeyType.SHUTTLE_FLAG.key + shuttleNo);
-// if (object == null) {
-// continue;
-// }
-//
-// int taskNo = Integer.parseInt(String.valueOf(object));
-//
-// Object obj = redisUtil.get(RedisKeyType.SHUTTLE_WORK_FLAG.key + taskNo);
-// if (obj == null) {
-// continue;
-// }
-//
-// ShuttleRedisCommand redisCommand = null;
-// try {
-// redisCommand = objectMapper.readValue(String.valueOf(obj), ShuttleRedisCommand.class);
-// } catch (IOException e) {
-// throw new RuntimeException(e);
-// }
-//
-// if (redisCommand == null) {
-// continue;
-// }
-//
-// ShuttleAssignCommand assignCommand = redisCommand.getAssignCommand();
-// List<ShuttleCommand> commands = assignCommand.getCommands();
-//
-// List<NavigateNode> controlLocList = new ArrayList<>();
-// for (ShuttleCommand command : commands) {
-// if (command.getComplete()) {
-// continue;
-// }
-//
-// if (command.getMode() == ShuttleCommandModeType.MOVE.id) {
-// List<NavigateNode> nodes = command.getNodes();
-// for (NavigateNode node : nodes) {
-// if(!controlLocList.contains(node)) {
-// controlLocList.add(node);
-// }
-// }
-// }
-// }
-//
-// for (NavigateNode node : controlLocList) {
-// int row = node.getX();
-// int bay = node.getY();
-//
-// List<MapNode> list = lists.get(row);
-// MapNode mapNode = list.get(bay);
-//
-// //鑺傜偣璁剧疆鎴怐isable
-// mapNode.setValue(MapNodeType.DISABLE.id);
-//
-// //鏇存柊list
-// list.set(bay, mapNode);
-// lists.set(row, list);
-// }
-//
-// }
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1