From 26419bf11ec888de7af9141a0ac1874065775e61 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 04 十一月 2023 13:59:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapUtils.java b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
index 9c8fd4c..ad25bb3 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -24,10 +24,6 @@
try {
NavigateMapData navigateMapData = new NavigateMapData(lev);
-// if (!redisUtil.tryLock("realtimeBasMap_" + lev)) {
-// return false;//鍔犻攣澶辫触
-// }
-
Object o = redisUtil.get("realtimeBasMap_" + lev);
if (o == null) {
return false;
@@ -37,6 +33,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 +55,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 {
//鑾峰彇鍘熷鑺傜偣鏁版嵁
@@ -65,8 +70,6 @@
basMap.setUpdateTime(new Date());
//灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
redisUtil.set("realtimeBasMap_" + lev, JSON.toJSONString(basMap));
-// //瑙ｉ攣
-// redisUtil.unlock("realtimeBasMap_" + lev);
return true;
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1