From 44fa920bbcf6cd94c81f3a6d2f3008925a8635ca Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 11 五月 2023 09:40:39 +0800
Subject: [PATCH] 四向穿梭车命令封装

---
 src/main/java/com/zy/common/utils/NavigateSolution.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index 89046a8..7be6f7a 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -21,10 +21,13 @@
         this.map = data;
     }
 
-    public NavigateSolution(String mapType) {
+    public NavigateSolution(Integer mapType) {
         //杞藉叆鍦板浘
         NavigateMapData mapData = new NavigateMapData();
-        int[][] data = mapData.getData(mapType);
+        int[][] data = mapData.getDataFromRedis(mapType);
+        if (data == null) {
+            data = mapData.getData(mapType);
+        }
         this.map = data;
     }
 
@@ -135,8 +138,8 @@
             }
         }
 
-        if (map[x][y] == 0 || map[x][y] == 3) {
-            //瀛愯建鍜屾瘝杞ㄦ墠鑳借繘琛屼笂涓嬬Щ鍔�
+        if (map[x][y] == 0 || map[x][y] == 3 || map[x][y] == 4 || map[x][y] == 5) {
+            //瀛愯建鍜屾瘝杞ㄣ�佽緭閫佺嚎銆佸厖鐢垫々鎵嶈兘杩涜涓婁笅绉诲姩
             if (is_valid(x + 1, y))
             {
                 NavigateNode node = new NavigateNode(x + 1, y);

--
Gitblit v1.9.1