From 4a976d3763be8a7bed743faf24abf2718ae18e31 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期三, 15 十月 2025 17:34:14 +0800 Subject: [PATCH] 2025.10.15 1. 走航季度报告相关数据计算逻辑调整 --- src/test/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceControllerTest.kt | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/test/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceControllerTest.kt b/src/test/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceControllerTest.kt index c7ea7e8..c54a5d3 100644 --- a/src/test/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceControllerTest.kt +++ b/src/test/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceControllerTest.kt @@ -38,13 +38,14 @@ @Test fun autoSourceTrace() { - val sourceTraceController = SourceTraceController(sceneInfoRep, sourceTraceRep, false) + val sourceTraceController = SourceTraceController(sceneInfoRep, sourceTraceRep, true) // val mCode = listOf( // "SH-CN-20241227", "SH-CN-20241127", "SH-CN-20240906", "SH-CN-20240830(05)", // "SH-CN-20240830(04)", "SH-CN-20240823", // "SH-CN-20240723(02)", //// "SH-CN-20250723(01)" // ) +// val startTime = LocalDateTime.of(2024, 12, 31, 0, 0, 0).atZone(ZoneId.systemDefault()).toInstant() val startTime = LocalDateTime.of(2025, 7, 1, 0, 0, 0).atZone(ZoneId.systemDefault()).toInstant() val endTime = LocalDateTime.of(2025, 9, 30, 23, 59, 59).atZone(ZoneId.systemDefault()).toInstant() val missions = missionMapper.selectByExample(Example(Mission::class.java).apply { @@ -108,16 +109,20 @@ @Test fun deleteSourceTrace() { - val mCode = listOf( - "SH-CN-20241227", "SH-CN-20241127", "SH-CN-20240906", "SH-CN-20240830(05)", - "SH-CN-20240830(04)", "SH-CN-20240823", - "SH-CN-20240723(02)", -// "SH-CN-20250723(01)" - ) - mCode.forEach { c -> - missionRep.findOne(c)?.let { - sourceTraceRep.delete(it) - } +// val mCode = listOf( +// "SH-CN-20241227", "SH-CN-20241127", "SH-CN-20240906", "SH-CN-20240830(05)", +// "SH-CN-20240830(04)", "SH-CN-20240823", +// "SH-CN-20240723(02)", +//// "SH-CN-20250723(01)" +// ) + val startTime = LocalDateTime.of(2025, 7, 1, 0, 0, 0).atZone(ZoneId.systemDefault()).toInstant() + val endTime = LocalDateTime.of(2025, 9, 30, 23, 59, 59).atZone(ZoneId.systemDefault()).toInstant() + val missions = missionMapper.selectByExample(Example(Mission::class.java).apply { + createCriteria().andBetween("startTime", startTime, endTime) + }) + missions.forEach { m -> + m ?: return@forEach + sourceTraceRep.delete(m) } } -- Gitblit v1.9.3