From dacef58ee7c44dffdd40cb646435c2993ad7a217 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 21 二月 2025 17:20:00 +0800
Subject: [PATCH] 1. 新增坐标点是否在多边形内部的判定算法并测试

---
 src/main/kotlin/com/flightfeather/uav/lightshare/bean/DataVo.kt |   15 ++++++++++-----
 1 files changed, 10 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..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
@@ -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()
         }

--
Gitblit v1.9.3