From 0d667ba939460c3dc6cdb0c974841bd0be5dc432 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 16 Dec 2020 13:41:56 +0800
Subject: [PATCH] report_avg_datas接口更新
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 9 +++++++--
1 files changed, 7 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..2a020ef 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 = (360.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 = (360.0 - (windDir+180.0) * Math.PI / 180.0);
U = windSpeed * Math.cos(dir);
V = windSpeed * Math.sin(dir);
@@ -1130,4 +1130,9 @@
return deviceMapper.getDeviceByCityCode();
}
+ @Override
+ public List<Device> getDevicesByAccountId(String id) {
+ return deviceMapper.getDevicesByAccountId(id);
+ }
+
}
--
Gitblit v1.8.0