From c9bbee8bb47d6f383f9699b59c046ddc0cb464e9 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 03 七月 2024 17:49:49 +0800
Subject: [PATCH] 1. 新增走航报告自动道路识别模块
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt
index 7e541ff..ffe64d4 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt
@@ -6,8 +6,11 @@
import com.flightfeather.uav.common.utils.ExcelUtil
import com.flightfeather.uav.common.utils.FileExchange
import com.flightfeather.uav.biz.dataprocess.AverageUtil
+import com.flightfeather.uav.biz.dataprocess.TrackSegment
import com.flightfeather.uav.domain.entity.*
import com.flightfeather.uav.domain.mapper.*
+import com.flightfeather.uav.domain.repository.MissionRep
+import com.flightfeather.uav.domain.repository.RealTimeDataRep
import com.flightfeather.uav.lightshare.bean.*
import com.flightfeather.uav.lightshare.service.RealTimeDataService
import com.flightfeather.uav.model.epw.EPWDataPrep
@@ -40,6 +43,8 @@
private val realTimeDataGridOptMapper: RealTimeDataGridOptMapper,
private val realTimeDataGridMinMapper: RealTimeDataGridMinMapper,
private val missionMapper: MissionMapper,
+ private val missionRep: MissionRep,
+ private val realTimeDataRep: RealTimeDataRep,
) : RealTimeDataService {
@Value("\${filePath}")
@@ -179,6 +184,12 @@
example.createCriteria().andEqualTo("deviceCode", deviceCode)
.andGreaterThan("dataTime", updateTime)
example.orderBy("dataTime")
+ }
+
+ override fun getSegmentData(missionCode: String): List<List<DataVo>> {
+ val mission = missionRep.findOne(missionCode) ?: throw BizException("浠诲姟涓嶅瓨鍦�")
+ val data = realTimeDataRep.fetchData(mission)
+ return TrackSegment.segmentWithRoad(data).map { it.map { b -> b.toDataVo() } }
}
override fun importData(file: MultipartFile): BaseResponse<DataImportResult> {
@@ -374,7 +385,7 @@
val averageUtil = AverageUtil<RealTimeDataGridOpt, RealTimeDataGridMin>({ d ->
minFormatter.format(d.dataTime)
}, { list ->
- list.avg()
+ list.avg() as RealTimeDataGridMin
})
while (total == -1 || page <= total) {
--
Gitblit v1.9.3