From d13a01d1769f29b336e5b9f8612c6d41aaabbbb1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 22 十一月 2024 20:42:20 +0800
Subject: [PATCH] #读取地图文件优化
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapUtils.java b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
index c817f28..434a0d4 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -3,9 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.core.common.SpringUtils;
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.RedisKeyType;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -19,24 +21,44 @@
* 鍐欏叆璺緞鑺傜偣鏁版嵁鍒皉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);
try {
- NavigateMapData navigateMapData = new NavigateMapData(lev);
-
- if (!redisUtil.tryLock("realtimeBasMap_" + lev)) {
- return false;//鍔犻攣澶辫触
+ if (nodes.isEmpty()) {
+ return true;
}
- Object o = redisUtil.get("realtimeBasMap_" + lev);
+ NavigateMapData navigateMapData = new NavigateMapData(lev);
+
+ Object o = redisUtil.get(RedisKeyType.MAP.key + lev);
if (o == null) {
return false;
}
+ //鑾峰彇灏忚溅鑺傜偣
+ 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>> listsHasShuttle = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, shuttlePoints);//鑾峰彇甯﹀皬杞﹀湴鍥炬暟鎹�
List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
+ //妫�娴嬭矾寰勬槸鍚﹁閿佸畾
+ if (lock) {
+ for (NavigateNode node : nodes) {
+ List<MapNode> listX = listsHasShuttle.get(node.getX());
+ MapNode mapNode = listX.get(node.getY());
+ if (mapNode.getValue() == -999) {
+ return false;//璺緞琚攣瀹氳繃锛岀姝㈠啀娆￠攣瀹�
+ }
+ if (mapNode.getValue() == 66) {
+ return false;//璺緞瀛樺湪灏忚溅锛岀姝㈤攣瀹�
+ }
+ }
+ }
+
+ //灏濊瘯閿佸畾/瑙ｉ攣璺緞
NavigateMapData mapData = new NavigateMapData(nodes.get(0).getZ());
List<List<MapNode>> realMap = mapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
for (NavigateNode node : nodes) {
@@ -61,13 +83,12 @@
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();
}
- return true;
+ return false;
}
}
--
Gitblit v1.9.1