diff --git a/src/main/kotlin/com/gzzn/omms/msgexchange/domain/flight/FlightModel.kt b/src/main/kotlin/com/gzzn/omms/msgexchange/domain/flight/FlightModel.kt index c4b5708..85e36f7 100644 --- a/src/main/kotlin/com/gzzn/omms/msgexchange/domain/flight/FlightModel.kt +++ b/src/main/kotlin/com/gzzn/omms/msgexchange/domain/flight/FlightModel.kt @@ -98,7 +98,7 @@ data class HistoryRules( return when { plannedAt != null && plannedAt.isBefore(now.minusSeconds(plannedAgeDays * 86400)) -> true // 条件 1 cancelledAt != null && cancelledAt.isBefore(now.minusSeconds(cancelledHours * 3600)) -> true // 条件 2 - // 条件 3(备降)待 FDIV 落地,见类注释 + // 条件 3(备降)待 FDIV 落未映射表后的读取路径落地,见类注释 beforeToday && departureAt != null && !departureAt.isAfter(now) -> true // 条件 4 beforeToday && arrivalAt != null && arrivalAt.isBefore(now.minusSeconds(arrivedHours * 3600)) -> true // 条件 5 diff --git a/src/main/kotlin/com/gzzn/omms/msgexchange/infra/persistence/jdbc/JdbcPgRepositories.kt b/src/main/kotlin/com/gzzn/omms/msgexchange/infra/persistence/jdbc/JdbcPgRepositories.kt index f28d6a9..aea11db 100644 --- a/src/main/kotlin/com/gzzn/omms/msgexchange/infra/persistence/jdbc/JdbcPgRepositories.kt +++ b/src/main/kotlin/com/gzzn/omms/msgexchange/infra/persistence/jdbc/JdbcPgRepositories.kt @@ -764,7 +764,7 @@ class JdbcFlightStateRepository( } } return rows.mapNotNull { r -> - // US-14 AC2 五类已结束条件共享求值(HistoryRules.isEnded);备降条件待 FDIV 落地, + // US-14 AC2 五类已结束条件共享求值(HistoryRules.isEnded);备降条件待 FDIV 落未映射表后的读取路径落地, // 见 HistoryRules 注释。解析不出来一律不命中:宁漏删不误删。 val ended = rules.isEnded( plannedAt = parseSisTime(r.sodt, zone),