From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期一, 23 十二月 2024 11:57:46 +0800
Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码
---
src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt b/src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt
index d387fb3..8ee5393 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt
@@ -11,38 +11,36 @@
*/
class DeviceSession {
- companion object{
- private val deviceMap = ConcurrentHashMap<String, ChannelHandlerContext?>()
- private val typeMap = ConcurrentHashMap<String, List<AirTypeData>>()
+ companion object {
private const val DEFAULT_DEVICE = "default_device"
+ }
+ private val deviceMap = ConcurrentHashMap<String?, ChannelHandlerContext?>()
+ private val typeMap = ConcurrentHashMap<String, List<AirTypeData>>()
- fun saveDevice(deviceCode: String?, channel: ChannelHandlerContext?) {
- deviceCode?.let {
- deviceMap.put(deviceCode, channel)
- }
+ fun saveDevice(deviceCode: String?, channel: ChannelHandlerContext?) {
+ deviceMap[deviceCode] = channel
+ }
+
+ fun getDevice(deviceCode: String?): ChannelHandlerContext? {
+ return if (deviceMap.containsKey(deviceCode))
+ deviceMap[deviceCode]
+ else
+ null
+ }
+
+ fun saveAirType(deviceCode: String?, types: List<AirTypeData>) {
+ if (deviceCode == null) {
+ typeMap[DEFAULT_DEVICE] = types
+ } else {
+ typeMap[deviceCode] = types
}
+ }
- fun getDevice(deviceCode: String?): ChannelHandlerContext? {
- return if (deviceMap.containsKey(deviceCode))
- deviceMap[deviceCode]
- else
- null
- }
-
- fun saveAirType(deviceCode: String?, types: List<AirTypeData>) {
- if (deviceCode == null) {
- typeMap[DEFAULT_DEVICE] = types
- } else {
- typeMap[deviceCode] = types
- }
- }
-
- fun getAirType(deviceCode: String?): List<AirTypeData>? {
- return when {
- deviceCode == null -> typeMap[DEFAULT_DEVICE]
- typeMap.containsKey(deviceCode) -> typeMap[deviceCode]
- else -> null
- }
+ fun getAirType(deviceCode: String?): List<AirTypeData>? {
+ return when {
+ deviceCode == null -> typeMap[DEFAULT_DEVICE]
+ typeMap.containsKey(deviceCode) -> typeMap[deviceCode]
+ else -> null
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3