From 61871594dfa0a5ac2c4d895d9ec4034feba57094 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 12 九月 2025 17:20:53 +0800 Subject: [PATCH] 2025.9.5 1. 新增走航任务统计功能 --- src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/RealTimeExceptionResult.kt | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/RealTimeExceptionResult.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/RealTimeExceptionResult.kt index 86ef036..15ae23b 100644 --- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/RealTimeExceptionResult.kt +++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/RealTimeExceptionResult.kt @@ -7,14 +7,18 @@ import com.flightfeather.uav.domain.entity.BaseRealTimeData import com.flightfeather.uav.domain.entity.SceneInfo import com.flightfeather.uav.domain.entity.avg +import com.flightfeather.uav.lightshare.bean.DataVo +import com.flightfeather.uav.lightshare.eunm.ExceptionStatusType import com.flightfeather.uav.socket.eunm.FactorType import java.math.BigDecimal +import java.util.UUID /** * * @date 2025/5/13 * @author feiyu02 */ +@Deprecated("2025.5.29, 閫昏緫涓庝笟鍔′笉鍖归厤锛屽悗缁垹闄�") class RealTimeExceptionResult() : BaseExceptionResult() { var deviceCode: String? = null @@ -22,8 +26,8 @@ var exception: String? = null var exceptionType: Int? = null - var factorId: Int? = null - var factorName: String? = null +// var factorId: Int? = null +// var factorName: String? = null var subFactorId: List<Int>? = null var subFactorName: List<String>? = null var selectedFactor: FactorFilter.SelectedFactor? = null @@ -39,10 +43,16 @@ // 寮傚父鏁版嵁锛屽ご灏惧彲鑳藉寘鍚竴瀹氶噺鐨勫亸绉� var dataList: MutableList<BaseRealTimeData> = mutableListOf() + var dataVoList: MutableList<DataVo> = mutableListOf() // 涓績鐐圭粡绾害 var longitude: BigDecimal? = null var latitude: BigDecimal? = null + + // 涓棿鏁版嵁鐐瑰潗鏍� + var midData: DataVo? = null +// var midLongitude: BigDecimal? = null +// var midLatitude: BigDecimal? = null // 婧簮浼佷笟 var relatedSceneList: List<SceneInfo?>? = null @@ -77,7 +87,10 @@ min = s.second max = s.third - exceptionData.forEach { dataList.add(it) } + exceptionData.forEach { + dataList.add(it) + dataVoList.add(it.toDataVo()) + } } private fun dataSummary( -- Gitblit v1.9.3