From 80d8b0ed5a43ba329c31b557fff81eceb42b022c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 十一月 2024 10:26:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 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 ce7c2ab..cfd22a3 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
@@ -4,6 +4,7 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.MapDataUtils;
import com.zy.acs.manager.core.domain.Lane;
+import com.zy.acs.manager.core.domain.type.BlockSeverityType;
import com.zy.acs.manager.core.service.LaneService;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.manager.entity.Route;
@@ -43,7 +44,7 @@
private ConfigService configService;
public synchronized NavigateNode execute(String agvNo, NavigateNode start, NavigateNode end
- , Boolean lock, List<String> blackList, Segment segment) {
+ , Boolean lock, List<String> blackList, Segment segment, BlockSeverityType blockSeverity) {
if (start.getX() == end.getX() && start.getY() == end.getY()) {
return end;
}
@@ -59,32 +60,15 @@
DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(null);
String[][] waveMatrix = mapDataDispatcher.getWaveMatrix(null);
-// List<String> included = new ArrayList<>();
-// if (!Cools.isEmpty(whiteList)) {
-// included.addAll(whiteList);
-// }
-// included.add(agvNo);
-// List<VehicleDto> vehicleDtoList = agvService.getVehicleDtoList(included);
-
while (openQueue.size() > 0) {
// 鍙栦紭鍏堥槦鍒楅《閮ㄥ厓绱犲苟涓旀妸杩欎釜鍏冪礌浠嶰pen琛ㄤ腑鍒犻櫎锛屽彇F鍊兼渶灏忕殑鑺傜偣
NavigateNode currentNode = openQueue.poll();
- // 瀵瑰綋鍓嶇粨鐐硅繘琛屾墿灞曪紝寰楀埌涓�涓洓鍛ㄧ粨鐐圭殑鏁扮粍
+
ArrayList<NavigateNode> neighbourNodes = this.getNeighborNodes(currentNode, mapMatrix, existNodes);
- // 瀵硅繖涓粨鐐归亶鍘嗭紝鐪嬫槸鍚︽湁鐩爣缁撶偣鍑虹幇
- label: for (NavigateNode node : neighbourNodes) {
+ for (NavigateNode node : neighbourNodes) {
+ boolean isEndNode = node.getX() == end.getX() && node.getY() == end.getY();
+
int weight = 0;
- // 鑺傜偣瀛樺湪鍏朵粬杞﹁締
-// for (VehicleDto vehicleDto : vehicleDtoList) {
-// if (node.getCodeData().equals(vehicleDto.getPosCode())) {
-// if (!Cools.isEmpty(blackList) && blackList.contains(vehicleDto.getVehicle())) {
-// continue label;
-// }
-// if (lock) {
-// continue label;
-// }
-// }
-// }
if (!Cools.isEmpty(blackList) && blackList.contains(node.getCodeData())) {
continue;
@@ -155,7 +139,7 @@
//鎵惧埌鐩爣缁撶偣灏辫繑鍥�
- if (node.getX() == end.getX() && node.getY() == end.getY()) {
+ if (isEndNode) {
//骞朵笖璁＄畻鍑篏锛� F锛� H绛夊��
node.initNode(currentNode, end);
return node;
--
Gitblit v1.9.1