From 13a7ee010e75bab8030c7c0be736d0ca02d966d7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 08 十二月 2023 10:04:11 +0800
Subject: [PATCH] #避让起始列
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapUtils.java b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
index 48d334d..ab003d9 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -6,6 +6,7 @@
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;
@@ -22,13 +23,13 @@
public synchronized boolean writeNavigateNodeToRedisMap(Integer lev, List<NavigateNode> nodes, boolean lock) {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
try {
+ if (nodes.isEmpty()) {
+ return true;
+ }
+
NavigateMapData navigateMapData = new NavigateMapData(lev);
-// 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;
}
@@ -37,6 +38,18 @@
ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
+ //妫�娴嬭矾寰勬槸鍚﹁閿佸畾
+ if (lock) {
+ for (NavigateNode node : nodes) {
+ List<MapNode> listX = lists.get(node.getX());
+ MapNode mapNode = listX.get(node.getY());
+ if (mapNode.getValue() == -999) {
+ return false;//璺緞琚攣瀹氳繃锛岀姝㈠啀娆￠攣瀹�
+ }
+ }
+ }
+
+ //灏濊瘯閿佸畾/瑙ｉ攣璺緞
NavigateMapData mapData = new NavigateMapData(nodes.get(0).getZ());
List<List<MapNode>> realMap = mapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
for (NavigateNode node : nodes) {
@@ -47,9 +60,6 @@
List<MapNode> listX = lists.get(node.getX());
MapNode mapNode = listX.get(node.getY());
if (lock) {
-// if (mapNode.getValue() == -999) {
-// return false;//璺緞琚攣瀹氳繃锛岀姝㈠啀娆￠攣瀹�
-// }
mapNode.setValue(-999);//绂佺敤搴撲綅
} else {
//鑾峰彇鍘熷鑺傜偣鏁版嵁
@@ -64,9 +74,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