From 7f9435bb4a074b4964f290c4d6905e0e233a19ec Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 21 十一月 2025 12:56:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/fake/ZyRgvFakeConnect.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/network/fake/ZyRgvFakeConnect.java b/src/main/java/com/zy/core/network/fake/ZyRgvFakeConnect.java
index eca22e9..5f959b0 100644
--- a/src/main/java/com/zy/core/network/fake/ZyRgvFakeConnect.java
+++ b/src/main/java/com/zy/core/network/fake/ZyRgvFakeConnect.java
@@ -4,16 +4,15 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.service.BasMapService;
import com.zy.common.model.NavigateNode;
import com.zy.common.utils.NavigateUtils;
-import com.zy.core.enums.RgvModeType;
import com.zy.core.enums.RgvStatusType;
import com.zy.core.enums.RgvTaskModeType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.network.api.ZyRgvConnectApi;
import com.zy.core.network.entity.ZyRgvStatusEntity;
-import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -73,9 +72,21 @@
return;
}
+ BasMapService basMapService = SpringUtils.getBean(BasMapService.class);
+ if (basMapService == null) {
+ return;
+ }
+
+ List<Integer> levList = basMapService.getLevList();
+
List<NavigateNode> navigateNodes = null;
try {
- navigateNodes = navigateUtils.calcByTrackSiteNo(status.getRgvPos(), sourcePos);
+ for (Integer lev : levList) {
+ navigateNodes = navigateUtils.calcByTrackSiteNo(lev, status.getRgvPos(), sourcePos);
+ if (navigateNodes != null) {
+ break;
+ }
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -86,7 +97,12 @@
List<NavigateNode> targetNavigateNodes = null;
try {
- targetNavigateNodes = navigateUtils.calcByTrackSiteNo(sourcePos, targetPos);
+ for (Integer lev : levList) {
+ targetNavigateNodes = navigateUtils.calcByTrackSiteNo(lev, sourcePos, targetPos);
+ if (targetNavigateNodes != null) {
+ break;
+ }
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -133,9 +149,21 @@
return;
}
+ BasMapService basMapService = SpringUtils.getBean(BasMapService.class);
+ if (basMapService == null) {
+ return;
+ }
+
+ List<Integer> levList = basMapService.getLevList();
+
List<NavigateNode> navigateNodes = null;
try {
- navigateNodes = navigateUtils.calcByTrackSiteNo(status.getRgvPos(), targetPos);
+ for (Integer lev : levList) {
+ navigateNodes = navigateUtils.calcByTrackSiteNo(lev, status.getRgvPos(), targetPos);
+ if (navigateNodes != null) {
+ break;
+ }
+ }
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1