From d44db08aa75fe0f243c1a9a09f35a6d8432b90fb Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Tue, 30 Jun 2020 23:23:46 +0800
Subject: [PATCH] 无人机应用大屏页面update
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..03d2ccb 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -555,14 +555,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;
}
--
Gitblit v1.8.0