From c3a428f2ef9dec82c49e1c9d4f425d3950d79804 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 28 十一月 2024 09:23:47 +0800
Subject: [PATCH] #定时充电
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 15 +++++++++------
1 files changed, 9 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 554de1b..204f937 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,6 +43,7 @@
public int[][] getData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
if (object == null) {
return null;
@@ -65,6 +64,8 @@
//鏁版嵁娣诲姞杩涗竴缁存暟缁�
map[j++] = tmp;
}
+
+ return map;
// String mapFilename = "map_" + lev + ".json";
// ClassPathResource classPathResource = new ClassPathResource(mapFilename);
@@ -154,6 +155,7 @@
//鑾峰彇JSON鏍煎紡鏁版嵁
public List<List<MapNode>> getJsonData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
if (object == null) {
return null;
@@ -206,6 +208,7 @@
//鑾峰彇JSON鏍煎紡鏁版嵁
public List<List<MapNode>> getJsonData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
if (object == null) {
return null;
--
Gitblit v1.9.1