From c4b6b51afdd3374735ed5f358457987eaa6e476f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 九月 2025 16:55:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index e820576..ea1ce40 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -12,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;
@@ -32,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;
@@ -68,6 +63,20 @@
}
/**
+ * 鑾峰彇鍦板浘妤煎眰鏁版嵁
+ */
+ @GetMapping("/map/lev/list")
+ @ManagerAuth
+ public R getMapLevList() {
+ List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
+ ArrayList<Integer> levList = new ArrayList<>();
+ for (BasMap basMap : basMaps) {
+ levList.add(basMap.getLev());
+ }
+ return R.ok().add(levList);
+ }
+
+ /**
* 鑾峰彇鍦板浘鏁版嵁
*/
@GetMapping("/map/{lev}/auth")
@@ -78,10 +87,24 @@
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.NONE.id, arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
+ List<List<MapNode>> arrayList = (List<List<MapNode>>) data;
+ 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();
+ }
+
+ List<List<MapNode>> arrayList = (List<List<MapNode>>) data;
+ List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.getMapTypes(NavigationMapType.NONE), arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
return R.ok().add(lists);
}
@@ -91,8 +114,10 @@
@GetMapping("/map/resetMap/auth")
@ManagerAuth
public R resetMapToRedis() {
- for (int i = 1; i <= 10; i++) {//鎬诲叡10灞傛ゼ
- redisUtil.del(RedisKeyType.MAP.key + i);
+ List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
+ for (BasMap basMap : basMaps) {
+ Integer lev = basMap.getLev();
+ redisUtil.del(RedisKeyType.MAP.key + lev);
}
return R.ok();
}
@@ -103,19 +128,6 @@
@GetMapping("/map/resetMap/{lev}")
@ManagerAuth(memo = "閲嶇疆Redis鍦板浘")
public R resetMapToRedisByLev(@PathVariable Integer lev, HttpServletRequest request) {
- // super璐﹀彿
- String token = request.getHeader("token");
- if (token == null) {
- return R.error();
- }
- String deToken = Cools.deTokn(token, superPwd);
- if (deToken == null) {
- return R.error("鏉冮檺涓嶈冻");
- }
- if (!"super".equals(deToken.substring(13))) {
- return R.error("鏉冮檺涓嶈冻");
- }
-
redisUtil.del(RedisKeyType.MAP.key + lev);
return R.ok();
}
--
Gitblit v1.9.1