From 5b0d58c3f7f35f61c0a0437bac3ff708db57fe61 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 七月 2024 17:34:16 +0800
Subject: [PATCH] 1. 修正实时走航数据平滑处理算法,PM2.5、PM10、VOC采用新的修正算法

---
 src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt
index 832df5a..7ac9d4b 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt
+++ b/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
@@ -31,4 +32,35 @@
                 }
                 return null
         }
+
+        fun toRowContent(): Array<Any> {
+                val row = mutableListOf<Any>()
+                row.add(deviceCode ?: "")
+                row.add(time ?: "")
+                row.add(lng ?: -1.0)
+                row.add(lat ?: -1.0)
+                values?.forEach {
+                        if (FactorType.outputFactor(it.factorName)) {
+                                row.add(it.factorData ?: -1.0)
+//                                row.add(it.physicalQuantity ?: -1.0)
+                        }
+                }
+                return row.toTypedArray()
+        }
+
+        fun toRowTitle(): Array<String> {
+                val list = mutableListOf<String>()
+                list.add("缂栧彿")
+                list.add("閲囨牱鏃堕棿")
+                list.add("缁忓害")
+                list.add("绾害")
+                values?.forEach {
+                        if (FactorType.outputFactor(it.factorName)) {
+                                val name = it.factorName ?: ""
+                                list.add(name)
+//                        list.add("$name(鐗╃悊閲�)")
+                        }
+                }
+                return list.toTypedArray()
+        }
 }
\ No newline at end of file

--
Gitblit v1.9.3