From e5bdf2e02090357cbd580d54e6cd2406dd541760 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 21 三月 2025 17:39:30 +0800
Subject: [PATCH] 1. 新增卫星遥测网格热力图计算逻辑(待完成)

---
 src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 9696b02..ab8b068 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt
@@ -39,8 +39,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 +54,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()
         }

--
Gitblit v1.9.3