From e8428af781f6cd8f0360aace90ba2e7eddb98033 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 四月 2025 10:35:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 80 ++++++++-------------------------------
1 files changed, 17 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 89acbce..a7beef5 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;
@@ -68,6 +69,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")
@@ -92,31 +107,7 @@
@ManagerAuth
public R resetMapToRedis() {
for (int i = 1; i <= 10; i++) {//鎬诲叡10灞傛ゼ
- BasMap basMap = basMapService.selectLatestMap(i);
- //杞藉叆鍦板浘
- List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
- if (basMap == null) {
- //鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
- //瀛樺叆鏁版嵁搴�
- basMap = new BasMap();
- basMap.setData(JSON.toJSONString(lists));
- basMap.setCreateTime(new Date());
- basMap.setUpdateTime(new Date());
- basMap.setLev(i);
-
- if (!basMapService.insert(basMap)) {
- log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
- }
- }else {
- basMap.setData(JSON.toJSONString(lists));
- basMap.setUpdateTime(new Date());
- if (!basMapService.updateById(basMap)) {
- log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
- }
- }
-
- //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
- redisUtil.set(RedisKeyType.MAP.key + i, JSON.toJSONString(basMap));
+ redisUtil.del(RedisKeyType.MAP.key + i);
}
return R.ok();
}
@@ -127,44 +118,7 @@
@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("鏉冮檺涓嶈冻");
- }
-
- BasMap basMap = basMapService.selectLatestMap(lev);
- //杞藉叆鍦板浘
- List<List<MapNode>> lists = navigateMapData.getJsonData(lev, -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
- if (basMap == null) {
- //鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
- //瀛樺叆鏁版嵁搴�
- basMap = new BasMap();
- basMap.setData(JSON.toJSONString(lists));
- basMap.setCreateTime(new Date());
- basMap.setUpdateTime(new Date());
- basMap.setLev(lev);
-
- if (!basMapService.insert(basMap)) {
- log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
- }
- } else {
- basMap.setData(JSON.toJSONString(lists));
- basMap.setUpdateTime(new Date());
- if (!basMapService.updateById(basMap)) {
- log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
- }
- }
-
- //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
- redisUtil.set(RedisKeyType.MAP.key + lev, JSON.toJSONString(basMap));
+ redisUtil.del(RedisKeyType.MAP.key + lev);
return R.ok();
}
--
Gitblit v1.9.1