From 2264dc290f69febf53c2f728dddd214505e50b93 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 22 十一月 2024 21:12:13 +0800
Subject: [PATCH] #读取地图文件优化
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 554de1b..9029c93 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -5,6 +5,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasMap;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.model.MapNode;
import com.zy.common.model.NavigateNode;
@@ -26,16 +27,13 @@
@Component
public class NavigateMapData {
- @Autowired
- private RedisUtil redisUtil;
-
private Integer lev;//鍦板浘妤煎眰
- public NavigateMapData() {
- this.lev = 1;
+ public Integer getLev() {
+ return lev;
}
- public NavigateMapData(Integer lev) {
+ public void setLev(Integer lev) {
this.lev = lev;
}
@@ -45,13 +43,13 @@
public int[][] getData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
- Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
- if (object == null) {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ List<Object> arrayList = redisUtil.lGet(RedisKeyType.BASIC_MAP.key + lev, 0, -1);
+ if (arrayList == 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;
@@ -154,13 +152,13 @@
//鑾峰彇JSON鏍煎紡鏁版嵁
public List<List<MapNode>> getJsonData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
- Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
- if (object == null) {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ List<Object> arrayList = redisUtil.lGet(RedisKeyType.BASIC_MAP.key + lev, 0, -1);
+ if (arrayList == null) {
return null;
}
//瑙ｆ瀽json鍦板浘鏁版嵁
- ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
return lists;
@@ -206,13 +204,13 @@
//鑾峰彇JSON鏍煎紡鏁版嵁
public List<List<MapNode>> getJsonData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
- Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
- if (object == null) {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ List<Object> arrayList = redisUtil.lGet(RedisKeyType.BASIC_MAP.key + lev, 0, -1);
+ if (arrayList == 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