From 79b3bca0befd3d247d9b9c17ea4287ed19b97920 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 11 五月 2023 11:18:37 +0800
Subject: [PATCH] Navigate库位计算错误、获取地图错误问题
---
src/main/java/com/zy/common/utils/NavigateUtils.java | 2 +-
src/main/java/com/zy/common/utils/NavigatePositionConvert.java | 6 +++---
src/main/java/com/zy/common/utils/NavigateSolution.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index 2ce466c..be0be98 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -37,14 +37,14 @@
//xyz杞磋浆鍧愭爣缂栧彿
public static Short xyToPosition(int x, int y, int z) {
StringBuffer sb = new StringBuffer();
- sb.append(x);
if (x < 10) {
- sb.append("00");
- } else if (x < 100) {
sb.append("0");
}
+ sb.append(x);
if (y < 10) {
+ sb.append("00");
+ }else if (y < 100) {
sb.append("0");
}
sb.append(y);
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index 7be6f7a..acb56a2 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -21,9 +21,9 @@
this.map = data;
}
- public NavigateSolution(Integer mapType) {
- //杞藉叆鍦板浘
- NavigateMapData mapData = new NavigateMapData();
+ public NavigateSolution(Integer mapType,Integer lev) {
+ //杞藉叆鍦板浘鎸囧畾灞傞珮鍦板浘
+ NavigateMapData mapData = new NavigateMapData(lev);
int[][] data = mapData.getDataFromRedis(mapType);
if (data == null) {
data = mapData.getData(mapType);
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index 306a049..a0aab42 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -26,7 +26,7 @@
start.setFather(null);
NavigateNode end = new NavigateNode(endArr[0], endArr[1]);
- NavigateSolution solution = new NavigateSolution(mapType);
+ NavigateSolution solution = new NavigateSolution(mapType, lev);
NavigateNode res_node = solution.astarSearch(start, end);
if (res_node == null) {
System.out.println("鏈壘鍒拌矾寰�");
--
Gitblit v1.9.1