From f510760823f431891a501cd556928e215702ddb7 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 13:36:11 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 67 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapUtils.java b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
index b11789c..59fbc88 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -2,10 +2,14 @@
import com.alibaba.fastjson.JSON;
import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.BasMap;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.MapNode;
import com.zy.common.model.NavigateNode;
import com.zy.common.model.enums.NavigationMapType;
+import com.zy.core.enums.MapNodeType;
+import com.zy.core.enums.RedisKeyType;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -19,26 +23,58 @@
* 鍐欏叆璺緞鑺傜偣鏁版嵁鍒皉edis鍦板浘涓�
* lock涓簍rue 绂佺敤搴撲綅锛宭ock涓篺alse鎭㈠搴撲綅
*/
- public synchronized boolean writeNavigateNodeToRedisMap(Integer lev, List<NavigateNode> nodes, boolean lock) {
+ public synchronized boolean writeNavigateNodeToRedisMap(Integer lev, Integer shuttleNo, List<NavigateNode> nodes, boolean lock) {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
try {
- NavigateMapData navigateMapData = new NavigateMapData(lev);
+ if (nodes.isEmpty()) {
+ return true;
+ }
-// if (!redisUtil.tryLock("realtimeBasMap_" + lev)) {
-// return false;//鍔犻攣澶辫触
-// }
-
- Object o = redisUtil.get("realtimeBasMap_" + lev);
+ Object o = redisUtil.get(RedisKeyType.MAP.key + lev);
if (o == null) {
return false;
}
+ //鑾峰彇灏忚溅鑺傜偣
+ int[] shuttlePoint = Utils.getShuttlePoint(shuttleNo);
+ if (shuttlePoint == null) {
+ return false;
+ }
+
+ //鑾峰彇灏忚溅鑺傜偣-鑾峰彇闄ょ櫧鍚嶅崟澶栫殑鎸囧畾妤煎眰鍏ㄩ儴绌挎杞y鍧愭爣鐐�
+ List<int[]> shuttlePoints = Utils.getShuttlePoints(shuttleNo, lev);
+
BasMap basMap = JSON.parseObject(o.toString(), BasMap.class);
ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
- List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
+ //甯﹀皬杞﹀湴鍥�
+ List<List<MapNode>> listsHasShuttle = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, shuttlePoints);//鑾峰彇甯﹀皬杞﹀湴鍥炬暟鎹�
- NavigateMapData mapData = new NavigateMapData(nodes.get(0).getZ());
- List<List<MapNode>> realMap = mapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+ //鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
+ List<List<MapNode>> lists = navigateMapData.rebuildData(arrayList);
+ //杞藉叆搴撲綅淇℃伅
+ lists = navigateMapData.loadLocMast(NavigationMapType.NONE.id, lists, lev, null);
+
+ //妫�娴嬭矾寰勬槸鍚﹁閿佸畾
+ if (lock) {
+ for (NavigateNode node : nodes) {
+ //鍒ゆ柇鏄惁涓哄綋鍓嶅皬杞�
+ if(shuttlePoint[0] == node.getX() && shuttlePoint[1] == node.getY()) {
+ continue;
+ }
+
+ List<MapNode> listX = listsHasShuttle.get(node.getX());
+ MapNode mapNode = listX.get(node.getY());
+ if (mapNode.getValue() == MapNodeType.LOCK.id) {
+ return false;//璺緞琚攣瀹氳繃锛岀姝㈠啀娆￠攣瀹�
+ }
+ if (mapNode.getValue() == MapNodeType.CAR.id) {
+ return false;//璺緞瀛樺湪灏忚溅锛岀姝㈤攣瀹�
+ }
+ }
+ }
+
+ //灏濊瘯閿佸畾/瑙ｉ攣璺緞
for (NavigateNode node : nodes) {
if (node.getZ() != lev) {
continue;
@@ -47,12 +83,9 @@
List<MapNode> listX = lists.get(node.getX());
MapNode mapNode = listX.get(node.getY());
if (lock) {
- mapNode.setValue(-999);//绂佺敤搴撲綅
+ mapNode.setValue(MapNodeType.LOCK.id);//绂佺敤搴撲綅
} else {
- //鑾峰彇鍘熷鑺傜偣鏁版嵁
- List<MapNode> rows = realMap.get(node.getX());
- MapNode col = rows.get(node.getY());
- mapNode.setValue(col.getValue());//鎭㈠搴撲綅
+ mapNode.setValue(node.getNodeValue());//鎭㈠鍘熷鑺傜偣鏁版嵁
}
listX.set(node.getY(), mapNode);
@@ -61,9 +94,7 @@
basMap.setData(JSON.toJSONString(lists));
basMap.setUpdateTime(new Date());
//灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
- redisUtil.set("realtimeBasMap_" + lev, JSON.toJSONString(basMap));
-// //瑙ｉ攣
-// redisUtil.unlock("realtimeBasMap_" + lev);
+ redisUtil.set(RedisKeyType.MAP.key + lev, JSON.toJSONString(basMap));
return true;
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1