From ff3b5df7015b2f2c5e24d9973a7b443309d8e579 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期六, 19 七月 2025 18:07:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 6 +++--- 1 files changed, 3 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..05d895e 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); @@ -867,7 +867,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 +983,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