From a2d6371396f74e4fb30a4c79e91c6b371a77d0b5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 22 十一月 2024 20:54:07 +0800
Subject: [PATCH] #读取地图文件优化
---
src/main/java/com/zy/common/utils/NavigateSolution.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index 7be6f7a..ccf08b8 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -1,8 +1,10 @@
package com.zy.common.utils;
+import com.core.common.SpringUtils;
import com.zy.common.model.NavigateNode;
import java.util.ArrayList;
+import java.util.List;
import java.util.PriorityQueue;
/**
@@ -16,17 +18,19 @@
public NavigateSolution() {
//杞藉叆鍦板浘
- NavigateMapData mapData = new NavigateMapData();
- int[][] data = mapData.getData();
+ NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
+ navigateMapData.setLev(1);
+ int[][] data = navigateMapData.getData();
this.map = data;
}
- public NavigateSolution(Integer mapType) {
- //杞藉叆鍦板浘
- NavigateMapData mapData = new NavigateMapData();
- int[][] data = mapData.getDataFromRedis(mapType);
+ public NavigateSolution(Integer mapType, Integer lev, List<int[]> whitePoints, List<int[]> shuttlePoints) {
+ //杞藉叆鍦板浘鎸囧畾灞傞珮鍦板浘
+ NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
+ navigateMapData.setLev(lev);
+ int[][] data = navigateMapData.getDataFromRedis(mapType, whitePoints, shuttlePoints);
if (data == null) {
- data = mapData.getData(mapType);
+ data = navigateMapData.getData(mapType, whitePoints, shuttlePoints);
}
this.map = data;
}
@@ -207,7 +211,7 @@
鎷垮埌鐖惰妭鐐瑰拰涓嬩竴鑺傜偣
閫氳繃鍒ゆ柇鐖惰妭鐐瑰拰涓嬩竴鑺傜偣鐨剎鏁版嵁鍜寉鏁版嵁閮戒笉鐩稿悓鏃讹紝鍒欒〃鏄庡綋鍓嶅潗鏍囨槸涓�涓嫄鐐�
*/
- return 2;
+ return 10;
}
//------------------A*鍚彂鍑芥暟-end------------------//
--
Gitblit v1.9.1