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/TransferStationHandler.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
index 825a0b1..361db5d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
@@ -12,13 +12,14 @@
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
@Slf4j
@Service
public class TransferStationHandler {
- private static final long LOAD_DELAY_MS = 60000L; // load ( inbound ) delay timeout
- private static final long PLACE_DELAY_MS = 15000L; // place ( outbound ) delay timeout
+ private static final int DEFAULT_LOAD_DELAY_MS = 15000; // load ( inbound ) delay timeout
+ private static final int DEFAULT_PLACE_DELAY_MS = 1000; // place ( outbound ) delay timeout
@Autowired
private SegmentService segmentService;
@@ -84,7 +85,7 @@
// }
// timeout
- return (now - preEndTime) < LOAD_DELAY_MS;
+ return (now - preEndTime) < Optional.ofNullable(rollerSta.getInboundWait()).orElse(DEFAULT_LOAD_DELAY_MS);
}
// outbound
@@ -106,7 +107,7 @@
// }
// timeout
- return (now - preEndTime) < PLACE_DELAY_MS;
+ return (now - preEndTime) < Optional.ofNullable(rollerSta.getOutboundWait()).orElse(DEFAULT_PLACE_DELAY_MS);
}
return false;
--
Gitblit v1.9.1