From d48f94b29304be6cabbeb6f9e9fe2b25bd7140f9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 09:14:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 924f899..1983b70 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -14,9 +14,11 @@
 import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasMapService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.common.CodeRes;
 import com.zy.common.model.MapNode;
+import com.zy.common.model.enums.NavigationMapType;
 import com.zy.common.utils.NavigateMapData;
 import com.zy.common.utils.RedisUtil;
 import com.zy.core.CrnThread;
@@ -56,6 +58,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private BasDevpService basDevpService;
+    @Autowired
+    private BasMapService basMapService;
     @Autowired
     private LocMastMapper locMastMapper;
     @Autowired
@@ -313,8 +317,79 @@
         //瑙f瀽json鍦板浘鏁版嵁
         ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
         NavigateMapData navigateMapData = new NavigateMapData(lev);
-        List<List<MapNode>> lists = navigateMapData.filterMap(-1, arrayList);//杩囨护鍦板浘鏁版嵁
+        List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
         return R.ok().add(lists);
     }
 
+    /**
+     * 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
+     */
+    @GetMapping("/map/resetMap/auth")
+    @ManagerAuth
+    public R resetMapToRedis() {
+        for (int i = 1; i <= 10; i++) {//鎬诲叡10灞傛ゼ
+            BasMap basMap = basMapService.selectLatestMap(i);
+            //杞藉叆鍦板浘
+            NavigateMapData mapData = new NavigateMapData(i);
+            List<List<MapNode>> lists = mapData.getJsonData(-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("realtimeBasMap_" + i, JSON.toJSONString(basMap));
+        }
+        return R.ok();
+    }
+
+    /**
+     * 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
+     */
+    @GetMapping("/map/resetMap/{lev}")
+    public R resetMapToRedisByLev(@PathVariable Integer lev) {
+        BasMap basMap = basMapService.selectLatestMap(lev);
+        //杞藉叆鍦板浘
+        NavigateMapData mapData = new NavigateMapData(lev);
+        List<List<MapNode>> lists = mapData.getJsonData(-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("realtimeBasMap_" + lev, JSON.toJSONString(basMap));
+        return R.ok();
+    }
+
 }

--
Gitblit v1.9.1