windyboy
99a0f5f738
按现行 docs/flight-state.md（111 行版，§1-§7）全面对齐 domain 包及其消费方， 删除整套指向已退役长版文档（§5.x-§10）的引用与死代码： - 语义：FlightStateEngine.snapshotState 由"完整快照整体替换"改为 §3.1 合并语义 ——出现 Set/Replace、缺失保留、标量空串显式清空；DELETED 不被日计划恢复（§3.3）。 - 校验：validateMessage 移除从未接线的报文覆盖范围（scope）参数，只保留 §4 步骤 2 的声明数量/航班标识/运营日推导校验；ScheduleBody 删除 scopeStart/scopeEnd。 - 删除死代码：domain/Decision.kt、FlightModel 的 SnapshotPatch/UpsertOutcome、 ProcState.isTerminal/archivable、SnapshotFlag.SEQN_REGRESSION、 ScheduleRecord.seqn（及 wire FlightRecordXml.SEQN）；codec 移除未消费 FFID。 - 删除未接线且引用已退役列（fday/last_message_id）的 SqlDialect 方言脚手架， oracle11g README 改为按 V1 现列重建的口径。 - 注释/测试：domain、processing、infra 仓储与 jobs/delivery、配置类及对应测试的 KDoc 章节引用全部对齐现行 flight-state.md/design.md；FlightStateEngineTest 重写为合并语义（62/62 通过）。 V1__flight_state_baseline.sql 保留原样（内容注释仍带旧章节号，改动会破坏 已应用迁移的 Flyway checksum，待重建基线或 V2 净迁移时收敛）。
53 lines
3.5 KiB
Kotlin
53 lines
3.5 KiB
Kotlin
package com.gzzn.omms.msgexchange.codec
|
|
|
|
import com.gzzn.omms.msgexchange.domain.flight.ScheduleRecord
|
|
|
|
/** Converts the annotated wire DTOs into the stable payload types used by processing. */
|
|
internal object SisWireMapper {
|
|
fun scheduleBody(xml: SchdXml): ScheduleBody = ScheduleBody(
|
|
recsDeclared = xml.recs ?: -1,
|
|
records = xml.fltr.mapNotNull(::scheduleRecord),
|
|
)
|
|
|
|
fun flopPayload(xml: FlightRecordXml): FlopPayload? =
|
|
xml.flid?.trim()?.takeIf(String::isNotEmpty)?.let {
|
|
FlopPayload(it, xml.scalars(), xml.collections())
|
|
}
|
|
|
|
private fun scheduleRecord(xml: FlightRecordXml): ScheduleRecord? =
|
|
xml.flid?.trim()?.takeIf(String::isNotEmpty)?.let {
|
|
ScheduleRecord(it, xml.scalars(), xml.collections())
|
|
}
|
|
|
|
private fun FlightRecordXml.scalars(): Map<String, String> = linkedMapOf<String, String>().apply {
|
|
listOf(
|
|
"ALCD" to alcd, "ALSC" to alsc, "FLNO" to flno, "MVIN" to mvin, "SODT" to sodt,
|
|
"FLTY" to flty, "FLIN" to flin, "ACFT" to acft, "RENO" to reno, "TAOP" to taop,
|
|
"TAFL" to tafl, "TAID" to taid, "TRML" to trml, "MAXP" to maxp, "CSOP" to csop,
|
|
"CSFT" to csft, "MAID" to maid, "ESTT" to estt, "ACTT" to actt, "STND" to stnd,
|
|
"PHAG" to phag, "CNCL" to cncl, "REMC" to remc, "BOTM" to botm, "LACL" to lacl,
|
|
"FINT" to fint, "APPT" to appt, "EGSR" to egsr, "EGST" to egst, "FHAG" to fhag,
|
|
"MHAG" to mhag, "VIPP" to vipp, "VIPR" to vipr, "LBNO" to lbno, "LBWT" to lbwt,
|
|
"PAXC" to paxc, "EXSC" to exsc, "EXSR" to exsr, "FTSS" to ftss, "PEDT" to pedt,
|
|
"NAAT" to naat, "NEAT" to neat, "PADT" to padt,
|
|
).forEach { (key, value) -> value?.let { put(key, it.trim()) } }
|
|
}
|
|
|
|
private fun FlightRecordXml.collections(): Map<String, List<Map<String, String>>> = linkedMapOf(
|
|
"GTDT" to gtdt.map { it.toMap("GTNO" to it.gtno, "GATE" to it.gate, "PGOT" to it.pgot, "PGCT" to it.pgct, "GOTM" to it.gotm, "GCTM" to it.gctm, "GTYP" to it.gtyp) },
|
|
"CKDT" to ckdt.map { it.toMap("CKNO" to it.ckno, "CHKC" to it.chkc, "CCLS" to it.ccls, "PCOT" to it.pcot, "PCCT" to it.pcct, "COTM" to it.cotm, "CCTM" to it.cctm, "CTYP" to it.ctyp) },
|
|
"CLDT" to cldt.map { it.toMap("CLNO" to it.clno, "BELT" to it.belt, "BCLS" to it.bcls, "PCOT" to it.pcot, "PCCT" to it.pcct, "FBAG" to it.fbag, "LBAG" to it.lbag, "BTYP" to it.btyp) },
|
|
"PSDT" to psdt.map { it.toMap("PSNO" to it.psno, "PSST" to it.psst, "STST" to it.stst, "STET" to it.stet) },
|
|
"CHDT" to chdt.map { it.toMap("CHNO" to it.chno, "CHUT" to it.chut, "CHCLS" to it.chcls, "PCBT" to it.pcbt, "PCET" to it.pcet, "CBTM" to it.cbtm, "CETM" to it.cetm, "CHTYP" to it.chtyp) },
|
|
"DELY" to dely.map { it.toMap("CODE" to it.code, "STRT" to it.strt, "DURA" to it.dura, "REMC" to it.text) },
|
|
"ABTM" to abtm.map { it.toMap("ASNO" to it.asno, "ABDG" to it.abdg, "ABOP" to it.abop, "AOTM" to it.aotm) },
|
|
"CHOT" to chot.map { it.toMap("CSNO" to it.csno, "CHID" to it.chid, "CHST" to it.chst, "CHTM" to it.chtm) },
|
|
"ROUT" to rout.map { it.toMap("RTNO" to it.rtno, "APCD" to it.apcd, "SCAT" to it.scat, "SCDT" to it.scdt) },
|
|
"ERUT" to erut.map { it.toMap("RTNO" to it.rtno, "APCD" to it.apcd, "SCAT" to it.scat, "SCDT" to it.scdt) },
|
|
).filterValues { it.isNotEmpty() }
|
|
|
|
private fun Any.toMap(vararg values: Pair<String, String?>): Map<String, String> = values.mapNotNull { (key, value) ->
|
|
value?.trim()?.let { key to it }
|
|
}.toMap(LinkedHashMap())
|
|
}
|