From 877b2519157cea762b1e63e9c57c09614216d684 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 24 七月 2025 19:27:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index bb2eaf3..2542703 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -732,7 +732,7 @@
//灏嗚矾寰勯攣涓庡皬杞﹁矾寰勮繘琛屽尮閰�
ArrayList<NavigateNode> tmp = new ArrayList<>();
//妫�娴嬭矾寰勬槸鍚﹁閿佸畾
- int[][] map = navigateMapData.getDataFromRedis(lev, NavigationMapType.DFX.id, null, null);
+ int[][] map = navigateMapData.getDataFromRedis(lev, NavigationMapType.getDfxWithDevice(), null, null);
for (NavigateNode node : path) {
if(map[node.getX()][node.getY()] == -999) {
tmp.add(node);
@@ -752,6 +752,9 @@
@Override
public synchronized boolean setProtocolStatus(ShuttleProtocolStatusType status) {
+ if (status.equals(ShuttleProtocolStatusType.IDLE)) {
+ this.shuttleProtocol.setIdleTime(System.currentTimeMillis());
+ }
this.shuttleProtocol.setProtocolStatus(status);
return true;
}
@@ -821,6 +824,13 @@
}
@Override
+ public boolean setTrafficControl(boolean enable, List<NavigateNode> nodeList) {
+ shuttleProtocol.setTrafficControl(enable);
+ shuttleProtocol.setTrafficControlNodes(nodeList);
+ return true;
+ }
+
+ @Override
public void updateDeviceDataLogTime(long time) {
shuttleProtocol.setDeviceDataLog(time);
}
@@ -867,7 +877,7 @@
int yp = Integer.parseInt(String.valueOf(nyNode.get("x")));
int z = Integer.parseInt(String.valueOf(nyNode.get("z")));
- List<List<MapNode>> mapData = navigateMapData.getJsonData(startNode.getZ(), NavigationMapType.NONE.id, null, null);
+ List<List<MapNode>> mapData = navigateMapData.getJsonData(startNode.getZ(), NavigationMapType.getMapTypes(NavigationMapType.NONE), null, null);
List<MapNode> mapNodes = mapData.get(node.getX());
MapNode mapNode = mapNodes.get(node.getY());
@@ -983,7 +993,7 @@
throw new CoolException("鍦板潃鐮佷笉瀛樺湪");
}
- List<List<MapNode>> mapData = navigateMapData.getJsonData(lev, NavigationMapType.NONE.id, null, null);
+ List<List<MapNode>> mapData = navigateMapData.getJsonData(lev, NavigationMapType.getMapTypes(NavigationMapType.NONE), null, null);
List<MapNode> mapNodes = mapData.get(locMast.getRow1());
MapNode mapNode = mapNodes.get(locMast.getBay1());
--
Gitblit v1.9.1