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/lightshare/service/impl/RealTimeDataServiceImpl.kt | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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..4bf03aa 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,12 @@
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.common.location.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.domain.repository.SegmentInfoRep
import com.flightfeather.uav.lightshare.bean.*
import com.flightfeather.uav.lightshare.service.RealTimeDataService
import com.flightfeather.uav.model.epw.EPWDataPrep
@@ -40,6 +44,9 @@
private val realTimeDataGridOptMapper: RealTimeDataGridOptMapper,
private val realTimeDataGridMinMapper: RealTimeDataGridMinMapper,
private val missionMapper: MissionMapper,
+ private val missionRep: MissionRep,
+ private val realTimeDataRep: RealTimeDataRep,
+ private val segmentInfoRep: SegmentInfoRep,
) : RealTimeDataService {
@Value("\${filePath}")
@@ -50,6 +57,7 @@
private val fileExchange = FileExchange()
override fun getSecondData(
+ deviceType: String?,
deviceCode: String?,
startTime: String?,
endTime: String?,
@@ -66,7 +74,12 @@
var pages = 0
val result = mutableListOf<DataVo>()
- when (UWDeviceType.getType(deviceCode)) {
+ val _deviceType = if (deviceType != null) {
+ UWDeviceType.fromValue(deviceType)
+ } else {
+ UWDeviceType.getType(deviceCode)
+ }
+ when (_deviceType) {
UWDeviceType.VEHICLE -> {
val pageInfo = PageHelper.startPage<RealTimeDataVehicle>(_page, _perPage)
realTimeDataVehicleMapper.selectByExample(Example(RealTimeDataVehicle::class.java).apply {
@@ -179,6 +192,31 @@
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)
+
+ val segInfo = SegmentInfo().apply { this.missionCode = missionCode }
+ val segList = segmentInfoRep.findList(segInfo)
+// return TrackSegment.segmentWithRoad(data).map { it.map { b -> b.toDataVo() } }
+ val res = mutableListOf<MutableList<DataVo>>()
+ res.add(mutableListOf())
+ var index = 0
+ data.forEach {
+ if (it.dataTime == null) return@forEach
+ if (it.dataTime!! <= segList[index]?.endTime) {
+ res[index].add(it.toDataVo())
+ if (it.dataTime!! == segList[index]?.endTime) {
+ index++
+ res.add(mutableListOf())
+ }
+ }
+ }
+ // 绉婚櫎鏈�鍚庝竴涓┖闆嗗悎
+ if (res.last().isEmpty()) res.removeLast()
+ return res
}
override fun importData(file: MultipartFile): BaseResponse<DataImportResult> {
@@ -374,7 +412,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