zhang
7 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27
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;