From 141696efeb3598b2a8c62aada6e6b45734e56f11 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 22 十二月 2025 16:59:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java b/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
index dbb8346..235b579 100644
--- a/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
+++ b/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.service.BasStationService;
import com.zy.common.model.NavigateNode;
import com.zy.common.utils.NavigateUtils;
import com.zy.common.utils.RedisUtil;
@@ -191,12 +193,9 @@
Integer stationId = command.getStationId();
Integer targetStationId = command.getTargetStaNo();
- String startLev = String.valueOf(stationId).substring(0, 1);
-
List<NavigateNode> navigateNodes = null;
-
try {
- navigateNodes = navigateUtils.calcByStationId(Integer.parseInt(startLev), stationId, targetStationId);
+ navigateNodes = navigateUtils.calcByStationId(stationId, targetStationId);
} catch (Exception e) {
e.printStackTrace();
}
@@ -209,6 +208,10 @@
}
private void diffLevCommand(StationCommand command, boolean generateBarcode) {
+ BasStationService basStationService = SpringUtils.getBean(BasStationService.class);
+ if (basStationService == null) {
+ return;
+ }
NavigateUtils navigateUtils = SpringUtils.getBean(NavigateUtils.class);
if (navigateUtils == null) {
return;
@@ -218,20 +221,27 @@
Integer stationId = command.getStationId();
Integer targetStationId = command.getTargetStaNo();
- String startLev = String.valueOf(stationId).substring(0, 1);
- String endLev = String.valueOf(targetStationId).substring(0, 1);
-
List<NavigateNode> navigateNodes = null;
List<NavigateNode> targetNavigateNodes = null;
try {
- List<NavigateNode> liftStationList = navigateUtils.findLiftStationList(Integer.parseInt(startLev));
+ BasStation startStation = basStationService.selectById(stationId);
+ if (startStation == null) {
+ return;
+ }
+
+ BasStation targetStation = basStationService.selectById(targetStationId);
+ if (targetStation == null) {
+ return;
+ }
+
+ List<NavigateNode> liftStationList = navigateUtils.findLiftStationList(startStation.getStationLev());
if(liftStationList.isEmpty()){
//鏈壘鍒版彁鍗囨満鑺傜偣
return;
}
- List<NavigateNode> targetLiftStationList = navigateUtils.findLiftStationList(Integer.parseInt(endLev));
+ List<NavigateNode> targetLiftStationList = navigateUtils.findLiftStationList(targetStation.getStationLev());
if(targetLiftStationList.isEmpty()){
//鏈壘鍒版彁鍗囨満鑺傜偣
return;
@@ -261,13 +271,13 @@
continue;
}
- navigateNodes = navigateUtils.calcByStationId(Integer.parseInt(startLev), stationId, liftStationId);
+ navigateNodes = navigateUtils.calcByStationId(stationId, liftStationId);
if(navigateNodes == null){
continue;
}
//璁＄畻鎻愬崌鏈哄埌鐩爣绔欑殑璺緞
- targetNavigateNodes = navigateUtils.calcByStationId(Integer.parseInt(endLev), targetLiftStationId, targetStationId);
+ targetNavigateNodes = navigateUtils.calcByStationId(targetLiftStationId, targetStationId);
if(targetNavigateNodes == null) {
continue;
}
--
Gitblit v1.9.1