From 182b605d7015caf520639961d52c02171e9322f1 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 27 一月 2026 09:02:12 +0800
Subject: [PATCH] #
---
version/db/new.sql | 10 +++++++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java | 9 +++++----
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 6 ++++++
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index ba7ca0b..df955d1 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -20,4 +20,12 @@
add height decimal(24, 9) null comment '浣滀笟楂樺害' after offset;
alter table man_sta
- add depth decimal(24, 9) null comment '浣滀笟娣卞害' after height;
\ No newline at end of file
+ add depth decimal(24, 9) null comment '浣滀笟娣卞害' after height;
+
+
+
+alter table man_sta
+ add inbound_wait int null comment '杩炵画鍏ュ簱绛夊緟' after angle;
+
+alter table man_sta
+ add outbound_wait int null comment '杩炵画鍑哄簱绛夊緟' after inbound_wait;
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..9edfdf1 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 = 1000; // load ( inbound ) delay timeout
+ private static final int DEFAULT_PLACE_DELAY_MS = 15000; // 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;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
index be68dfa..508194c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
@@ -64,6 +64,12 @@
@ApiModelProperty(value= "浣滀笟瑙掑害")
private String angle;
+ @ApiModelProperty(value= "杩炵画鍏ュ簱绛夊緟(ms)")
+ private Integer inboundWait;
+
+ @ApiModelProperty(value= "杩炵画鍑哄簱绛夊緟(ms)")
+ private Integer outboundWait;
+
@ApiModelProperty(value= "鑷姩")
private String autoing;
--
Gitblit v1.9.1