src/main/java/com/zy/asrs/controller/ConsoleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/mapper/BasMapMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/BasMapService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BasMapMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/console.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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(); } } src/main/java/com/zy/asrs/mapper/BasMapMapper.java
@@ -11,4 +11,6 @@ BasMap selectLatestMap(Integer lev);//获取最新地图数据 boolean deleteByLev(Integer lev);//删除指定楼层地图 } src/main/java/com/zy/asrs/service/BasMapService.java
@@ -7,4 +7,6 @@ BasMap selectLatestMap(Integer lev);//获取最新地图数据 boolean deleteByLev(Integer lev);//删除指定楼层地图 } 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); } } 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> 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) {