From 1d366c286744424abace59d68b85afccaa899200 Mon Sep 17 00:00:00 2001 From: windyboy Date: Wed, 23 Sep 2026 17:34:28 +0800 Subject: [PATCH] =?UTF-8?q?docs(acm2-100):=20=E6=B8=85=E9=99=A4=E5=A4=87?= =?UTF-8?q?=E9=99=8D=E6=9C=AA=E8=A7=A3=E7=A0=81=E6=AE=8B=E7=95=99=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gzzn/omms/msgexchange/domain/flight/FlightModel.kt | 2 +- .../msgexchange/infra/persistence/jdbc/JdbcPgRepositories.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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),