From b7b520bfe8b35683112284861f0dca8e645cbd56 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:22:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hc-satellite-data-import-1227_2'
---
src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt
index f7d5760..a8c9d8e 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt
@@ -11,6 +11,7 @@
import com.flightfeather.uav.domain.entity.Mission
import com.flightfeather.uav.domain.repository.RealTimeDataRep
import com.flightfeather.uav.domain.repository.SegmentInfoRep
+import com.flightfeather.uav.socket.eunm.UWDeviceType
import org.springframework.stereotype.Component
import java.time.LocalDateTime
import java.time.ZoneId
@@ -20,7 +21,7 @@
* 鏁版嵁寮傚父鍒嗘瀽鎺у埗鍣�
*/
@Component
-class ExceptionAnalysisController(
+class ExceptionAnalysisController(
private val realTimeDataRep: RealTimeDataRep,
private val locationRoadNearby: LocationRoadNearby,
private val segmentInfoRep: SegmentInfoRep,
@@ -47,7 +48,11 @@
val result = mutableListOf<ExceptionResult>()
taskList.forEach { it.init() }
// 杞鏁版嵁锛岃绠楀悇涓紓甯�
- realTimeDataRep.fetchData(mission.deviceCode, mission.startTime, mission.endTime).forEach { d ->
+ realTimeDataRep.fetchData(UWDeviceType.fromValue(mission.deviceType),
+ mission.deviceCode,
+ mission.startTime,
+ mission.endTime
+ ).forEach { d ->
taskList.forEach { it.onNextData(d) }
}
// 鍚勪釜寮傚父鍒嗘瀽鍒嗗埆缁撴潫
@@ -87,7 +92,7 @@
private fun road(r: ExceptionResult) {
val sT = LocalDateTime.ofInstant(r.startDate?.toInstant(), ZoneId.systemDefault())
val eT = LocalDateTime.ofInstant(r.endDate?.toInstant(), ZoneId.systemDefault())
- val segments = segmentInfoRep.findPeriod(sT, eT)
+ val segments = segmentInfoRep.findPeriod(r.missionCode, sT, eT)
var txt = ""
val size = segments.size
segments.forEachIndexed { i, s ->
--
Gitblit v1.9.3