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/eunm/UWDeviceType.kt | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt b/src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt
index d3e193e..9385288 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/eunm/UWDeviceType.kt
@@ -6,15 +6,19 @@
enum class UWDeviceType(val value: String, val des: String) {
UAV("0b", "鏃犱汉鏈鸿澶�"),
VEHICLE("0a", "杞﹁浇璁惧"),
+ BOAT("0c", "鏃犱汉鑸硅澶�"),
GRID("0d", "缃戞牸鍖栬澶�");
companion object {
/**
* 鏍规嵁璁惧缂栧彿鑾峰彇璁惧绫诲瀷
*/
- fun getType(deviceCode: String?): UWDeviceType? = when (deviceCode?.substring(0, 2)) {
+ fun getType(deviceCode: String?): UWDeviceType? = fromValue(deviceCode?.substring(0, 2))
+
+ fun fromValue(value: String?): UWDeviceType? = when (value) {
UAV.value -> UAV
VEHICLE.value -> VEHICLE
+ BOAT.value -> BOAT
GRID.value -> GRID
else -> null
}
--
Gitblit v1.9.3