src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt
@@ -1,5 +1,6 @@
package com.flightfeather.uav.lightshare.bean
import com.fasterxml.jackson.annotation.JsonIgnore
import com.fasterxml.jackson.annotation.JsonInclude
import com.flightfeather.uav.model.BaseMData
import com.flightfeather.uav.socket.bean.AirData
@@ -39,8 +40,10 @@
                row.add(lng ?: -1.0)
                row.add(lat ?: -1.0)
                values?.forEach {
                        row.add(it.factorData ?: -1.0)
                        row.add(it.physicalQuantity ?: -1.0)
                        if (FactorType.outputFactor(it.factorName)) {
                                row.add(it.factorData ?: -1.0)
//                                row.add(it.physicalQuantity ?: -1.0)
                        }
                }
                return row.toTypedArray()
        }
@@ -52,9 +55,11 @@
                list.add("经度")
                list.add("纬度")
                values?.forEach {
                        val name = it.factorName ?: ""
                        list.add(name)
                        list.add("$name(物理量)")
                        if (FactorType.outputFactor(it.factorName)) {
                                val name = it.factorName ?: ""
                                list.add(name)
//                        list.add("$name(物理量)")
                        }
                }
                return list.toTypedArray()
        }