From 6d766eed50f34b102e607ea471f2ee565a8b9d30 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 17 一月 2025 16:15:43 +0800 Subject: [PATCH] 1. 修改融合数据逻辑中,融合数据id数组为先排序后转换为字符串,修复同一批原始数据因为id排序不一样被判定为不同的融合数据的问题; --- src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt b/src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt index 3e1667e..0fffb10 100644 --- a/src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt +++ b/src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt @@ -1,6 +1,8 @@ package com.flightfeather.uav.socket.bean import com.fasterxml.jackson.annotation.JsonInclude +import com.flightfeather.uav.socket.eunm.FactorType +import kotlin.math.round /** * @author riku @@ -20,4 +22,14 @@ //鐘舵�佷綅 var statusList: List<String>? = null + + fun setData(factorType: FactorType, value: Float?) { + setData(factorType, round(value?.toDouble()?.times(1000) ?: .0) / 1000) + } + + fun setData(factorType: FactorType, value: Double?) { + factorId = factorType.value.toString() + factorName = factorType.des + factorData = value + } } \ No newline at end of file -- Gitblit v1.9.3