From 97aa2cd09e92f73cd4dff3d99eaef64e748c80b3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 28 六月 2023 19:04:32 +0800
Subject: [PATCH] 优化出库小车避让
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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..8cbd62b 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,26 @@
//瑙ｆ瀽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 <= 4; i++) {
+ Object data = redisUtil.get("realtimeBasMap_" + i);
+ if (data == null) {
+ continue;
+ }
+
+ redisUtil.del("realtimeBasMap_" + i);
+ basMapService.deleteByLev(i);
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1