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/NavigateMapData.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 9029c93..204f937 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -44,12 +44,13 @@
public int[][] getData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- List<Object> arrayList = redisUtil.lGet(RedisKeyType.BASIC_MAP.key + lev, 0, -1);
- if (arrayList == null) {
+ Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
+ if (object == null) {
return null;
}
//瑙ｆ瀽json鍦板浘鏁版嵁
+ ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
int[][] map = new int[lists.size()][];
int j = 0;
@@ -63,6 +64,8 @@
//鏁版嵁娣诲姞杩涗竴缁存暟缁�
map[j++] = tmp;
}
+
+ return map;
// String mapFilename = "map_" + lev + ".json";
// ClassPathResource classPathResource = new ClassPathResource(mapFilename);
@@ -153,12 +156,13 @@
public List<List<MapNode>> getJsonData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- List<Object> arrayList = redisUtil.lGet(RedisKeyType.BASIC_MAP.key + lev, 0, -1);
- if (arrayList == null) {
+ Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
+ if (object == null) {
return null;
}
//瑙ｆ瀽json鍦板浘鏁版嵁
+ ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
return lists;
@@ -205,12 +209,13 @@
public List<List<MapNode>> getJsonData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- List<Object> arrayList = redisUtil.lGet(RedisKeyType.BASIC_MAP.key + lev, 0, -1);
- if (arrayList == null) {
+ Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
+ if (object == null) {
return null;
}
//瑙ｆ瀽json鍦板浘鏁版嵁
+ ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
return lists;
--
Gitblit v1.9.1