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