From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java
index 4e57f55..e8dd401 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java
@@ -45,7 +45,7 @@
@Autowired
private AgvModelService agvModelService;
@Autowired
- private LaneService laneService;
+ private LaneBuilder laneBuilder;
@Autowired
private ConfigService configService;
@Autowired
@@ -137,7 +137,7 @@
// lane
if (pointOfTurn) {
- List<int[]> laneCodeIdxList = laneService.getLaneCodeIdxList(node.getCodeData());
+ List<int[]> laneCodeIdxList = laneBuilder.getLaneCodeIdxList(node.getCodeData());
if (!Cools.isEmpty(laneCodeIdxList)) {
Set<String> lanVehicleSet = new HashSet<>();
@@ -235,7 +235,7 @@
for (RetreatNavigateNode node : neighborNodes) {
// lane
- List<int[]> laneCodeIdxList = laneService.getLaneCodeIdxList(node.getCodeData());
+ List<int[]> laneCodeIdxList = laneBuilder.getLaneCodeIdxList(node.getCodeData());
if (!Cools.isEmpty(laneCodeIdxList)) {
Set<String> lanVehicleSet = new HashSet<>();
--
Gitblit v1.9.1