From 71f29001d7ec27a72b33143dc104abd34822268a Mon Sep 17 00:00:00 2001
From: jianghaiyue <jianghaiyue@zkyt.com>
Date: 星期二, 21 十月 2025 09:47:35 +0800
Subject: [PATCH] 更新了null值处理

---
 algo-zkd/src/main/java/com/algo/service/RemainingPathProcessor.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/algo-zkd/src/main/java/com/algo/service/RemainingPathProcessor.java b/algo-zkd/src/main/java/com/algo/service/RemainingPathProcessor.java
index 0c411d6..a9e0085 100644
--- a/algo-zkd/src/main/java/com/algo/service/RemainingPathProcessor.java
+++ b/algo-zkd/src/main/java/com/algo/service/RemainingPathProcessor.java
@@ -193,8 +193,16 @@
             String currentDirection = currentCode.getDirection();
             String nextDirection = nextCode.getDirection();
 
-            if (!currentDirection.equals(nextDirection)) {
-                stayTime += config.getTurnTime(currentDirection, nextDirection);
+            if (currentDirection != null && nextDirection != null) {
+                if (!currentDirection.equals(nextDirection)) {
+                    stayTime += config.getTurnTime(currentDirection, nextDirection);
+                }
+            } else {
+                if (pathIndex == agv.getCurrentPathIndex()) {
+                    System.out.println("AGV " + agv.getAgvId() + 
+                                     " 鐨勫墿浣欒矾寰勪腑direction瀛楁涓簄ull");
+                }
+                stayTime += 0.5; 
             }
         }
 
@@ -208,7 +216,7 @@
                     stayTime += 2.0; // 鏀捐揣闇�瑕�2绉�
                     break;
                 case "3": // 鍏呯數
-                    stayTime += 10.0; // 鍏呯數鍋滈潬闇�瑕�10绉�
+                    stayTime += 100.0; // 鍏呯數鍋滈潬
                     break;
                 default:
                     stayTime += 1.0; // 鍏朵粬鍔ㄤ綔闇�瑕�1绉�

--
Gitblit v1.9.1