From d3c5982218db1413c8f609f1f51b49c49a2db496 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 21 Oct 2020 17:19:58 +0800
Subject: [PATCH] 大屏多设备数据报表接口
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 957b5e8..343cdd3 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -117,7 +117,9 @@
public String queryValueByMacAndTime(String mac, Date time) {
return historyMapper.selectValueByMacAndTime(mac, time);
}
-
+ public String getValueByMacAndTime(String mac, String time,String time1) {
+ return historyMapper.getValueByMacAndTime(mac, time,time1);
+ }
@Override
public List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters) {
ValidateUtil.notNull(parameters.get("regionCode"), "param.is.null");
@@ -521,7 +523,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())) {
--
Gitblit v1.8.0