From b63790fa580ea78777f16bff6bc79373d675dd10 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 八月 2025 16:50:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index a7beef5..5b4a3d8 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -13,11 +13,9 @@
import com.zy.common.utils.NavigateMapData;
import com.zy.common.utils.RedisUtil;
import com.zy.core.enums.RedisKeyType;
-import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -33,13 +31,9 @@
public class ConsoleController {
@Autowired
- private SlaveProperties slaveProperties;
- @Autowired
private BasMapService basMapService;
@Autowired
private RedisUtil redisUtil;
- @Value("${super.pwd}")
- private String superPwd;
@Autowired
private NavigateMapData navigateMapData;
@@ -96,7 +90,27 @@
BasMap basMap = JSON.parseObject(data.toString(), BasMap.class);
//瑙ｆ瀽json鍦板浘鏁版嵁
ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
- List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
+
+ List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.getMapTypes(NavigationMapType.NONE, NavigationMapType.PATH_LOCK), arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
+ return R.ok().add(lists);
+ }
+
+ /**
+ * 鑾峰彇搴撲綅鍦板浘鏁版嵁
+ */
+ @GetMapping("/locMap/{lev}/auth")
+ @ManagerAuth
+ public R getLocMap(@PathVariable Integer lev) {
+ Object data = redisUtil.get(RedisKeyType.MAP.key + lev);
+ if (data == null) {
+ return R.error();
+ }
+
+ BasMap basMap = JSON.parseObject(data.toString(), BasMap.class);
+ //瑙ｆ瀽json鍦板浘鏁版嵁
+ ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
+
+ List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.getMapTypes(NavigationMapType.NONE), arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
return R.ok().add(lists);
}
--
Gitblit v1.9.1