修改监测因子类型

riku

2020-12-11 7269d4a4755fa48c45e827bdc5b5ac56c6eca99c

 src/main/kotlin/com/flightfeather/uav/socket/decoder/impl/DataUnitDecoderImpl.kt

@@ -1,10 +1,12 @@
package com.flightfeather.uav.socket.decoder.impl

import com.flightfeather.uav.socket.bean.AirData
import com.flightfeather.uav.socket.bean.AirDataPackage
import com.flightfeather.uav.socket.bean.AirTypeData
import com.flightfeather.uav.socket.decoder.DataUnitDecoder
import com.flightfeather.uav.socket.eunm.FactorType
import org.slf4j.LoggerFactory
import java.text.SimpleDateFormat

/**
 * @author riku
@@ -14,6 +16,7 @@

    private val logger = LoggerFactory.getLogger(javaClass.name)

    private val types = mutableListOf<AirTypeData>()

    override fun getAirConfirmData(b: List<String>): List<AirTypeData> {
        val resultList = mutableListOf<AirTypeData>()
@@ -22,25 +25,126 @@
                resultList.add(AirTypeData(f))
            }
        }
        types.clear()
        types.addAll(resultList)

        return resultList
    }

    override fun getAirData(b: List<String>): List<AirData> {
        val resultList = mutableListOf<AirData>()

        var i = 0
        while (i < b.size - 3) {
            val a = "${b[i]}${b[i + 1]}".toInt(16)
            var b1 = b[i + 2].toInt(16).toDouble()
            while (b1 >= 1) {
                b1 /= 10
        types.forEach {
            if (i > b.size - it.factorType.byteLength) {
                return@forEach
            }
            val data = a + b1
            resultList.add(AirData().apply {
                factorData = data
            })
            i += 3

            when (it.factorType) {
                FactorType.LNG -> {
                    val valid = b[i].toInt(16).toChar()//经纬度是否有效（有效: A; 无效: V）
                    val a1 = b[i + 1].toInt(16)
                    val b1 = b[i + 2].toInt(16)
                    var b2 = "${b[i + 3]}${b[i + 4]}".toInt(16).toDouble()
                    while (b2 >= 1) {
                        b2 /= 10
                    }
                    val lng = a1 + (b1 + b2) / 60
                    val s = b[i + 5].toInt(16).toChar()

                    resultList.add(AirData().apply {
                        factorId = it.factorType.value?.toString()
                        factorName = it.factorType.des
                        factorData = lng
                        statusList = listOf(valid.toString(), s.toString())
                    })
                }
                FactorType.LAT -> {
                    val a1 = b[i].toInt(16)
                    val b1 = b[i + 1].toInt(16)
                    var b2 = "${b[i + 2]}${b[i + 3]}".toInt(16).toDouble()
                    while (b2 >= 1) {
                        b2 /= 10
                    }
                    val lat = a1 + (b1 + b2) / 60
                    val s = b[i + 4].toInt(16).toChar()
                    resultList.add(AirData().apply {
                        factorId = it.factorType.value.toString()
                        factorName = it.factorType.des
                        factorData = lat
                        statusList = listOf(s.toString())
                    })
                }
                FactorType.TIME -> {
                    val year = b[i].toInt(16).toString().run { numberFormat(this) }
                    val month = b[i+1].toInt(16).toString().run { numberFormat(this) }
                    val day = b[i+2].toInt(16).toString().run { numberFormat(this) }
                    val hour = b[i+3].toInt(16).toString().run { numberFormat(this) }
                    val minute = b[i+4].toInt(16).toString().run { numberFormat(this) }
                    val second = b[i + 5].toInt(16).toString().run { numberFormat(this) }
                    val date = "20$year-$month-$day $hour:$minute:$second"
                    val time = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date).time
                    resultList.add(AirData().apply {
                        factorId = it.factorType.value.toString()
                        factorName = it.factorType.des
                        factorData = time.toDouble()
                        statusList = listOf(date)
                    })
                }
                else -> {
                    when (it.factorType.byteLength) {
                        AirDataPackage.FACTOR_BIT_LENGTH_2 -> {
                            val a1 = "${b[i]}${b[i + 1]}".toInt(16)
                            var b1 = b[i + 2].toInt(16).toDouble()
                            while (b1 >= 1) {
                                b1 /= 10
                            }
                            val data1 = a1 + b1

                            resultList.add(AirData().apply {
                                factorId = it.factorType.value?.toString()
                                factorName = it.factorType.des
                                factorData = data1
                            })
                        }
                        AirDataPackage.FACTOR_BIT_LENGTH_1 -> {
                            //数据实际值（3位字节表示）
                            val a1 = "${b[i]}${b[i + 1]}".toInt(16)
                            var b1 = b[i + 2].toInt(16).toDouble()
                            while (b1 >= 1) {
                                b1 /= 10
                            }
                            val data1 = a1 + b1

                            //数据物理量（3位字节表示）
                            val a2 = "${b[i+3]}${b[i + 4]}".toInt(16)
                            var b2 = b[i + 5].toInt(16).toDouble()
                            while (b2 >= 1) {
                                b2 /= 10
                            }
                            val data2 = a2 + b2

                            resultList.add(AirData().apply {
                                factorId = it.factorType.value?.toString()
                                factorName = it.factorType.des
                                factorData = data1
                                physicalQuantity = data2
                            })
                        }
                    }
                }
            }

            i += it.factorType.byteLength
        }

        return resultList
    }

    private fun numberFormat(num: String) =
            if (num.length < 2) {
                "0$num"
            } else {
                num
            }
}