From 4b5d0c06baa6542c7d9acde19e97b90232da0c88 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 20 四月 2021 09:42:42 +0800
Subject: [PATCH] 1. 新增获取工业企业信息接口; 2. 调整获取数据接口的结果按照时间升序排列; 3. 新增获取给定时间之后的数据的接口;

---
 src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt b/src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt
index ff079ed..d387fb3 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt
@@ -38,10 +38,10 @@
         }
 
         fun getAirType(deviceCode: String?): List<AirTypeData>? {
-            return if (typeMap.containsKey(deviceCode)) {
-                typeMap[deviceCode]
-            } else {
-                null
+            return when {
+                deviceCode == null -> typeMap[DEFAULT_DEVICE]
+                typeMap.containsKey(deviceCode) -> typeMap[deviceCode]
+                else -> null
             }
         }
     }

--
Gitblit v1.9.3