1. 新增用电量数据的接收协议 2. 调整socket接收模块的代码结构

riku

2021-06-17 81bd0388494d45463de42cd91bd8c33f10f0030a

 src/main/kotlin/com/flightfeather/uav/socket/DeviceSession.kt

@@ -11,38 +11,38 @@
 */
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?) {
        deviceCode?.let {
            deviceMap.put(deviceCode, channel)
        }
    }

        fun getDevice(deviceCode: String?): ChannelHandlerContext? {
            return if (deviceMap.containsKey(deviceCode))
                deviceMap[deviceCode]
            else
                null
    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 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
        }
    }
}