From 88954c5d1a31b0e0022e7f2fb882594c6e5c5982 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Sep 2020 16:11:05 +0800
Subject: [PATCH] 更新射阳大屏地图显示不正确
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 39a6e46..f46c6ea 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -383,7 +383,8 @@
}
returnMap = AQICalculation.hourlyAQI(AQIMap);
}
-
+ long aqi = Math.round(Double.valueOf(returnMap.get("AQI").toString()));
+ returnMap.put("AQI",aqi);
return returnMap;
}
@@ -520,7 +521,9 @@
for (Map.Entry<String, Object> entry : map.entrySet()) {
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(entry.getKey())) {
- mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ if (entry.getValue() != null) {
+ mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ }
} else if (("min" + sensor.getSensorKey()).equals(entry.getKey())) {
mapMin.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
} else if (("max" + sensor.getSensorKey()).equals(entry.getKey())) {
@@ -555,14 +558,16 @@
for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(entry.getKey())) {
- dataMap.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ if (entry.getValue() != null) {
+ dataMap.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ }
}
}
}
}
Map<String, Object> map = sensorMapper.getSensorBySensorKey(parameters.get("sensorKey").toString());
- parameters.put("unit",map.get("unit"));
- parameters.put("description",map.get("description"));
+ parameters.put("unit", map.get("unit"));
+ parameters.put("description", map.get("description"));
return uavSensorData;
}
@@ -642,4 +647,10 @@
}
return maxList;
}
+
+ @Override
+ public String getJsonData(String mac, String time,String table) {
+ return historyMapper.getJsonData(mac,time,table);
+ }
+
}
--
Gitblit v1.8.0