From 69395e27cc6de6574c4df456f546054085aa933b Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期二, 25 二月 2025 15:38:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 52 +-------------------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 +++++++----
src/main/resources/application.yml | 2
3 files changed, 17 insertions(+), 59 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..e820576 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -92,31 +92,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();
}
@@ -140,31 +116,7 @@
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();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2db8c2b..cfdff9c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -82,25 +82,31 @@
try {
for (int i = 1; i <= 4; i++) {//鎬诲叡鍥涘眰妤�
Object data = redisUtil.get(RedisKeyType.MAP.key + i);
- if (data == null) {//redis鍦板浘鏁版嵁涓虹┖锛屼粠鏁版嵁搴撲腑鑾峰彇
+ if (data == null) {//redis鍦板浘鏁版嵁涓虹┖
BasMap basMap = basMapService.selectLatestMap(i);
if (basMap == null) {
- //鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
- //杞藉叆鍦板浘
- List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, null, 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("鍦板浘鏁版嵁瀛樺偍澶辫触");
}
}
+ //杞藉叆鍦板浘
+ List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+
+ //瀛樺叆鏁版嵁搴�
+ basMap.setData(JSON.toJSONString(lists));
+ basMap.setCreateTime(new Date());
+ basMap.setUpdateTime(new Date());
+ basMap.setLev(i);
+
+ if (!basMapService.updateById(basMap)) {
+ log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
+ }
+
//灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
redisUtil.set(RedisKeyType.MAP.key + i, JSON.toJSONString(basMap));
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 23331b2..081f3c3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,7 +19,7 @@
redis:
host: 127.0.0.1
port: 6379
- database: 0
+ database: 6
# password: 123456
mybatis-plus:
--
Gitblit v1.9.1