From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index edd5c3d..5e5f1f7 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -829,7 +829,7 @@
if (tvoc == null) {
tvoc = 0.0;
}
- Double dir = (90.0 - windDir * Math.PI / 180.0);
+ Double dir = (270.0 - (windDir+180.0) * Math.PI / 180.0);
U = windSpeed * Math.cos(dir);
V = windSpeed * Math.sin(dir);
@@ -1031,7 +1031,7 @@
if (tvoc == null) {
tvoc = 0.0;
}
- Double dir = (90.0 + windDir * Math.PI / 180.0);
+ Double dir = (270.0 + (windDir+180.0) * Math.PI / 180.0);
U = windSpeed * Math.cos(dir);
V = windSpeed * Math.sin(dir);
--
Gitblit v1.8.0