From 590a64af2cdd33427ed8eda2eb983b07dd60ab8b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 16 一月 2026 12:05:12 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java
index 139fa84..3a310e6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java
@@ -3,11 +3,13 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.MapDataUtils;
-import com.zy.acs.manager.core.service.LaneService;
+import com.zy.acs.manager.core.service.AgvAreaDispatcher;
+import com.zy.acs.manager.core.service.LaneBuilder;
import com.zy.acs.manager.core.service.astart.domain.AStarNavigateNode;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.core.utils.RouteGenerator;
import com.zy.acs.manager.manager.entity.Segment;
+import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.JamService;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
@@ -29,20 +31,39 @@
public static final int WEIGHT_CALC_FACTOR = 1;
+ // right left up down
+ private final static int[][] DIRECTIONS = {{0,1},{0,-1},{-1,0},{1,0}};
+
@Autowired
private MapDataDispatcher mapDataDispatcher;
@Autowired
private JamService jamService;
@Autowired
- private LaneService laneService;
+ private LaneBuilder laneBuilder;
@Autowired
private ConfigService configService;
+ @Autowired
+ private AgvAreaDispatcher agvAreaDispatcher;
+ @Autowired
+ private AgvService agvService;
public synchronized AStarNavigateNode execute(String agvNo, AStarNavigateNode start, AStarNavigateNode end
, Boolean lock, List<String> blackList, Segment segment) {
if (start.getX() == end.getX() && start.getY() == end.getY()) {
return end;
}
+
+ // scope code area: 4ms
+ Long agvId = agvService.getAgvId(agvNo);
+ Boolean withinArea = agvAreaDispatcher.isAgvExistsInAnyArea(agvId);
+ List<String> scopeCodeList = new ArrayList<>();
+ if (withinArea) {
+ scopeCodeList = agvAreaDispatcher.getCodesByAgvId(agvId);
+ if (!Cools.isEmpty(scopeCodeList) && !scopeCodeList.contains(start.getCodeData())) {
+ withinArea = false;
+ }
+ }
+
Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
PriorityQueue<AStarNavigateNode> openQueue = new PriorityQueue<>();
@@ -63,9 +84,6 @@
DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(null);
String[][] waveMatrix = mapDataDispatcher.getWaveMatrix(null);
- long getNeighborNodesTime = 0;
- int getNeighborNodesCount = 0;
-
while (!openQueue.isEmpty()) {
// 鍙栦紭鍏堥槦鍒楅《閮ㄥ厓绱犲苟涓旀妸杩欎釜鍏冪礌浠嶰pen琛ㄤ腑鍒犻櫎锛屽彇F鍊兼渶灏忕殑鑺傜偣
AStarNavigateNode currentNode = openQueue.poll();
@@ -77,10 +95,13 @@
}
long currentTime = System.currentTimeMillis();
List<AStarNavigateNode> neighbourNodes = this.getNeighborNodes(currentNode, mapMatrix, existNodes);
- getNeighborNodesTime += System.currentTimeMillis() - currentTime;
- getNeighborNodesCount ++;
for (AStarNavigateNode node : neighbourNodes) {
node.setCodeData(codeMatrix[node.getX()][node.getY()]);
+
+ if (withinArea) {
+ assert !Cools.isEmpty(scopeCodeList);
+ if (!scopeCodeList.contains(node.getCodeData())) { continue; }
+ }
boolean isEndNode = node.getX() == end.getX() && node.getY() == end.getY();
@@ -135,7 +156,7 @@
}
// 鍗曞贩閬撹溅杈嗗杞芥暟閲�
- List<int[]> laneCodeIdxList = laneService.getLaneCodeIdxList(node.getCodeData());
+ List<int[]> laneCodeIdxList = laneBuilder.getLaneCodeIdxList(node.getCodeData());
if (!Cools.isEmpty(laneCodeIdxList)) {
Set<String> lanVehicleSet = new HashSet<>();
@@ -186,9 +207,6 @@
// System.out.println("getNeighborNodes spend time: " + getNeighborNodesTime +", count: " + getNeighborNodesCount);
return null;
}
-
- // right left up down
- private final static int[][] DIRECTIONS = {{0,1},{0,-1},{-1,0},{1,0}};
// 鑾峰彇鍥涘懆鑺傜偣
private List<AStarNavigateNode> getNeighborNodes(AStarNavigateNode currentNode, int[][] mapMatrix, Set<AStarNavigateNode> existNodes) {
--
Gitblit v1.9.1