From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期一, 23 十二月 2024 11:57:46 +0800
Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码
---
src/main/kotlin/com/flightfeather/uav/model/epw/WindDirWeight.kt | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/model/epw/WindDirWeight.kt b/src/main/kotlin/com/flightfeather/uav/model/epw/WindDirWeight.kt
index 927fae2..7074a30 100644
--- a/src/main/kotlin/com/flightfeather/uav/model/epw/WindDirWeight.kt
+++ b/src/main/kotlin/com/flightfeather/uav/model/epw/WindDirWeight.kt
@@ -32,14 +32,13 @@
private fun getAngle(p1: Pair<Double, Double>, p2: Pair<Double, Double>, wd: Double): Double {
val dx = p2.first - p1.first
val dy = p2.second - p1.second
- var x1 = atan2(dy, dx) * 180 / PI
+ var x1 = atan2(dy, dx) * 180 / PI + 180
if (x1 < 0) x1 += 360
var x2 = 270 - wd
if (x2 < 0) x2 += 360
x1 = abs(x2 - x1)
if (x1 > 180) x1 = 360 - x1
// println("澶硅锛�$x1")
- x1 = 180 - x1
return x1
}
}
\ No newline at end of file
--
Gitblit v1.9.3