From 8eb584869b4fd4de0f51c93f2616f12e51df9193 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 17:48:29 +0800
Subject: [PATCH] 2025.12.18 1. 动态溯源相关分析逻辑调整； 2. 走航报告接口参数调整；
---
src/test/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceControllerTest.kt | 92 +++++++++++++++-------------------------------
1 files changed, 30 insertions(+), 62 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 0961852..7b99c9c 100644
--- a/src/test/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceControllerTest.kt
+++ b/src/test/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceControllerTest.kt
@@ -14,6 +14,8 @@
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.junit4.SpringRunner
import tk.mybatis.mapper.entity.Example
+import java.time.LocalDateTime
+import java.time.ZoneId
@RunWith(SpringRunner::class)
@SpringBootTest
@@ -36,75 +38,41 @@
@Test
fun autoSourceTrace() {
- val sourceTraceController = SourceTraceController(sceneInfoRep, sourceTraceRep, false)
- 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 {m ->
- val rtData = realTimeDataService.getSecondData(
- m?.deviceType,
- m?.deviceCode,
- DateUtil.instance.dateToString(m?.startTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS),
- DateUtil.instance.dateToString(m?.endTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS),
- null,
- 1,
- 10000
- )
- rtData.data?.forEach { d ->
- val rtdVehicle = d.toBaseRealTimeData(RealTimeDataVehicle::class.java)
+ val sourceTraceController = SourceTraceController(sceneInfoRep, sourceTraceRep, true)
+ val startTime = LocalDateTime.of(2025, 12, 11, 0, 0, 0).atZone(ZoneId.systemDefault()).toInstant()
+ val endTime = LocalDateTime.of(2025, 12, 11, 23, 59, 59).atZone(ZoneId.systemDefault()).toInstant()
+ val missions = missionMapper.selectByExample(Example(Mission::class.java).apply {
+ createCriteria().andBetween("startTime", startTime, endTime)
+ })
+ missions.forEach { m ->
+ val rtData = realTimeDataService.getSecondData(
+ m?.deviceType,
+ m?.deviceCode,
+ DateUtil.instance.dateToString(m?.startTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS),
+ DateUtil.instance.dateToString(m?.endTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS),
+ null,
+ 1,
+ 10000
+ )
+ rtData.data?.forEach { d ->
+ val rtdVehicle = d.toBaseRealTimeData(RealTimeDataVehicle::class.java)
// Thread.sleep(500)
- sourceTraceController.addOneData(rtdVehicle)
- }
- sourceTraceController.initTask()
+ sourceTraceController.addOneData(rtdVehicle)
}
+ sourceTraceController.initTask()
}
-// val missions = missionMapper.selectByExample(Example(Mission::class.java).apply {
-// createCriteria().andEqualTo("deviceType", "0a")
-// .andLessThanOrEqualTo("startTime", "2024-11-07 15:00:00")
-// orderBy("startTime").desc()
-// })
-// missions.forEach { m ->
-// val rtData = realTimeDataService.getSecondData(
-// m?.deviceType,
-// m?.deviceCode,
-// DateUtil.instance.dateToString(m?.startTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS),
-// DateUtil.instance.dateToString(m?.endTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS),
-// null,
-// 1,
-// 10000
-// )
-// rtData.data?.forEach { d ->
-// val rtdVehicle = d.toBaseRealTimeData(RealTimeDataVehicle::class.java)
-//// Thread.sleep(500)
-// sourceTraceController.addOneData(rtdVehicle)
-// }
-// sourceTraceController.initTask()
-// }
-// val rtData = realTimeDataService.getSecondData(
-// "0a",
-// "0a0000000001",
-// "2024-08-23 12:30:23",
-// "2024-08-23 15:12:56",
-// null,
-// 1,
-// 10000
-// )
-// rtData.data?.forEach { d ->
-// val rtdVehicle = d.toBaseRealTimeData(RealTimeDataVehicle::class.java)
-//// Thread.sleep(500)
-// sourceTraceController.addOneData(rtdVehicle)
-// }
-
}
@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 startTime = LocalDateTime.of(2025, 12, 11, 0, 0, 0).atZone(ZoneId.systemDefault()).toInstant()
+ val endTime = LocalDateTime.of(2025, 12, 11, 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