From 92f1d486de0d064d7066120f1f6814e3c39dbf6d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 11 五月 2023 12:56:19 +0800
Subject: [PATCH] 地图重置(重置地图占位信息)

---
 src/main/java/com/zy/asrs/mapper/BasMapMapper.java            |    2 ++
 src/main/java/com/zy/asrs/controller/ConsoleController.java   |   21 +++++++++++++++++++++
 src/main/resources/mapper/BasMapMapper.xml                    |    5 +++++
 src/main/webapp/views/console.html                            |   20 +++++++++++++++++++-
 src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java |    6 ++++++
 src/main/java/com/zy/asrs/service/BasMapService.java          |    2 ++
 6 files changed, 55 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..b2acdf6 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -14,6 +14,7 @@
 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;
@@ -56,6 +57,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private BasDevpService basDevpService;
+    @Autowired
+    private BasMapService basMapService;
     @Autowired
     private LocMastMapper locMastMapper;
     @Autowired
@@ -317,4 +320,22 @@
         return R.ok().add(lists);
     }
 
+    /**
+     * 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
+     */
+    @GetMapping("/map/resetMap/auth")
+    @ManagerAuth
+    public R resetMapToRedis() {
+        for (int i = 1; i <= 4; i++) {
+            Object data = redisUtil.get("realtimeBasMap_" + i);
+            if (data == null) {
+                continue;
+            }
+
+            redisUtil.del("realtimeBasMap_" + i);
+            basMapService.deleteByLev(i);
+        }
+        return R.ok();
+    }
+
 }
diff --git a/src/main/java/com/zy/asrs/mapper/BasMapMapper.java b/src/main/java/com/zy/asrs/mapper/BasMapMapper.java
index a44f8f8..561086b 100644
--- a/src/main/java/com/zy/asrs/mapper/BasMapMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasMapMapper.java
@@ -11,4 +11,6 @@
 
     BasMap selectLatestMap(Integer lev);//鑾峰彇鏈�鏂板湴鍥炬暟鎹�
 
+    boolean deleteByLev(Integer lev);//鍒犻櫎鎸囧畾妤煎眰鍦板浘
+
 }
diff --git a/src/main/java/com/zy/asrs/service/BasMapService.java b/src/main/java/com/zy/asrs/service/BasMapService.java
index 838b546..56b0095 100644
--- a/src/main/java/com/zy/asrs/service/BasMapService.java
+++ b/src/main/java/com/zy/asrs/service/BasMapService.java
@@ -7,4 +7,6 @@
 
     BasMap selectLatestMap(Integer lev);//鑾峰彇鏈�鏂板湴鍥炬暟鎹�
 
+    boolean deleteByLev(Integer lev);//鍒犻櫎鎸囧畾妤煎眰鍦板浘
+
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java
index c68971e..19abcca 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java
@@ -13,4 +13,10 @@
     public BasMap selectLatestMap(Integer lev) {
         return this.baseMapper.selectLatestMap(lev);
     }
+
+    @Override
+    public boolean deleteByLev(Integer lev) {
+        return this.baseMapper.deleteByLev(lev);
+    }
+
 }
diff --git a/src/main/resources/mapper/BasMapMapper.xml b/src/main/resources/mapper/BasMapMapper.xml
index c0dd76d..0f46fc6 100644
--- a/src/main/resources/mapper/BasMapMapper.xml
+++ b/src/main/resources/mapper/BasMapMapper.xml
@@ -20,4 +20,9 @@
         order by id desc
     </select>
 
+    <delete id="deleteByLev">
+        delete from asr_bas_map
+        where lev = #{lev}
+    </delete>
+
 </mapper>
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index ae228b6..6a10eab 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -24,7 +24,8 @@
                 <button class="floorBtn  btn-16" onclick="changFloor(this,3)" style="margin-top: 250px">3F</button>
                 <button class="floorBtn  btn-16" onclick="changFloor(this,4)" style="margin-top: 300px">4F</button>
             </div>
-            <button class="floorBtn  btn-16" onclick="testMove()" style="margin-top: 350px">娴嬭瘯绉诲姩杞�</button>
+            <button class="floorBtn  btn-16" onclick="testMove()" style="margin-top: 350px;font-size: 14px;">娴嬭瘯绉诲姩杞�</button>
+            <button class="floorBtn  btn-16" onclick="resetMap()" style="margin-top: 400px;font-size: 14px;">閲嶇疆鍦板浘</button>
 
         <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
         <div class="main-part">
@@ -718,6 +719,23 @@
 
     }
 
+    /**
+     * 閲嶇疆鍦板浘
+     */
+    function resetMap() {
+        $.ajax({
+            url:baseUrl+"/console/map/resetMap/auth",
+            headers:{
+                'token': localStorage.getItem('token')
+            },
+            data:{},
+            method:'get',
+            success:function (res) {
+                layer.msg('閲嶇疆瀹屾垚');
+            }
+        })
+    }
+
     // 灏忚溅鍋忕Щ鍔ㄧ敾
     function carAnimate(id, target) {
         if (id === 1000) {

--
Gitblit v1.9.1