From 9880d87f87b074b45150a66867c0d1870e6cb3e2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 06 Aug 2020 14:31:13 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
index 01c42b7..bd36de4 100644
--- a/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
@@ -100,6 +100,21 @@
}
@Override
+ public String getTVOCByMac(String mac,String time,String sensor) {
+ return historyHourlyMapper.getTVOCByMac(mac,time,sensor);
+ }
+
+ @Override
+ public String getPressureByMac(String mac, String time) {
+ return historyHourlyMapper.getPressureByMac(mac,time);
+ }
+
+ @Override
+ public Map<String,Object> getDataByMac(String mac, String time) {
+ return historyHourlyMapper.getDataByMac(mac,time);
+ }
+
+ @Override
public Point getDirPoint(Map<String, Object> parameters) throws Exception {
Map<String, Object> pollutionSourceData = getPollutionSourceDataByHour(parameters);
if (MapUtils.isEmpty(pollutionSourceData)) {
@@ -109,7 +124,7 @@
Device device = deviceService.getDeviceByMac(mac, false);
Point pointEnd = new Point();
if (MapUtils.isNotEmpty(pollutionSourceData)) {
- if (pollutionSourceData.get("e18") != null && pollutionSourceData.get("e23") != null && pollutionSourceData.get("e6") != null) {
+ if (pollutionSourceData.get("e18") != null && pollutionSourceData.get("e23") != null) {
double windSpeed = Double.valueOf(pollutionSourceData.get("e18").toString());
double winDir = Double.valueOf(pollutionSourceData.get("e23").toString());
double distance = windSpeed * 3600;
--
Gitblit v1.8.0