From 538ba7a3bbc682f4537f1dd34f93feb2cf56b08e Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 14 十月 2025 17:32:04 +0800
Subject: [PATCH] 2025.10.14 1. 新增数据统计颗粒度选项,可选秒级数据、分钟数据进行数据统计 2. 典型隐患区域统计新增按照污染溯源区域进行分类统计的功能

---
 src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt |    4 ++--
 1 files changed, 2 insertions(+), 2 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 b548bc7..65c0fab 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt
@@ -42,7 +42,7 @@
         row.add(lng ?: -1.0)
         row.add(lat ?: -1.0)
         values?.forEach {
-            if (FactorType.outputFactor(it.factorName)) {
+            if (FactorType.isOutputFactor(it.factorName)) {
                 row.add(it.factorData ?: -1.0)
 //                                row.add(it.physicalQuantity ?: -1.0)
             }
@@ -57,7 +57,7 @@
         list.add("缁忓害")
         list.add("绾害")
         values?.forEach {
-            if (FactorType.outputFactor(it.factorName)) {
+            if (FactorType.isOutputFactor(it.factorName)) {
                 val name = it.factorName ?: ""
                 list.add(name)
 //                        list.add("$name(鐗╃悊閲�)")

--
Gitblit v1.9.3