From af2ff6353abb09500ff08293490446a4d40d8e87 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 31 Jul 2020 17:03:19 +0800 Subject: [PATCH] 更换天气预测接口,根据城市名获取预测与实测数据对比 --- 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