From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 11 +++++++++--
1 files changed, 9 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 35fe74a..2a020ef 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -751,6 +751,8 @@
@Override
public List byMonitorIdGetDeviceAndWind(String id, String tab) {
List<DeviceAndWind> deviceAndWinds = deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id), tab);
+ System.out.println(deviceAndWinds);
+ System.out.println(deviceAndWinds);
List loList = new ArrayList();
List laList = new ArrayList();
Double U = 0.0;
@@ -827,7 +829,7 @@
if (tvoc == null) {
tvoc = 0.0;
}
- Double dir = (180.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);
@@ -1029,7 +1031,7 @@
if (tvoc == null) {
tvoc = 0.0;
}
- Double dir = (180.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);
@@ -1128,4 +1130,9 @@
return deviceMapper.getDeviceByCityCode();
}
+ @Override
+ public List<Device> getDevicesByAccountId(String id) {
+ return deviceMapper.getDevicesByAccountId(id);
+ }
+
}
--
Gitblit v1.8.0