From 4c872cea75d5b3c3832f0f0796ba727e8f91168d Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 21 Oct 2020 15:03:50 +0800 Subject: [PATCH] 增加获取单台设备五分钟平均值以及沧州环保局下属设备只显示十个参数 --- src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java index a370f6e..8c83b3b 100644 --- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java +++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java @@ -797,20 +797,28 @@ if (rhour == nowHour) { Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap); - double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString()); - resultMap.put("goodValue", v); + if (sumO3Map != null) { + double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString()); + resultMap.put("goodValue", v); + } } else if (rhour == nowHour + 1) { Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap); - double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2; - resultMap.put("goodValue", String.valueOf(Math.round(v))); + if (sumO3Map != null) { + double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2; + resultMap.put("goodValue", String.valueOf(Math.round(v))); + } } else if (rhour == nowHour + 2) { Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap); - double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3; - resultMap.put("goodValue", String.valueOf(Math.round(v))); + if (sumO3Map != null) { + double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3; + resultMap.put("goodValue", String.valueOf(Math.round(v))); + } } else if (rhour == nowHour + 3) { Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap); - double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4; - resultMap.put("goodValue", String.valueOf(Math.round(v))); + if (sumO3Map != null) { + double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4; + resultMap.put("goodValue", String.valueOf(Math.round(v))); + } } } } -- Gitblit v1.8.0