From e36d33b5789cc098898af42fdce6cab057db3cc6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 06 Aug 2020 16:33:57 +0800
Subject: [PATCH] update
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 2 +-
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 5720be2..3eae89e 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -454,7 +454,7 @@
for (Map<String, Object> beamMap : beamList) {
String btime = beamMap.get("time").toString();
if (btime.equals(rtime)) {
- realMap.put("beam", beamMap.get("beam").toString());
+ realMap.put("beam", beamMap.get("beam").toString().split("\\.")[0]);
}
}
Calendar calendar = Calendar.getInstance();
@@ -539,6 +539,22 @@
for (Map<String, Object> map : resultList) {
String date = map.get("time").toString().substring(0, 16);
map.put("time", date);
+ if (map.get("AQI") != null) {
+ String aqi = map.get("AQI").toString().split("\\.")[0];
+ map.put("AQI", aqi);
+ }
+ if (map.get("precip") != null) {
+ String aqi = map.get("precip").toString();
+ if (aqi.equals("0.0")) {
+ map.put("precip", "");
+ }
+ }
+ if (map.get("precip6") != null) {
+ String aqi = map.get("precip6").toString();
+ if (aqi.equals("0.0")) {
+ map.put("precip6", "");
+ }
+ }
}
return resultList;
}
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index fc16813..aa83d96 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -68,7 +68,7 @@
<select id="getBeamByMacs" resultType="java.util.Map">
SELECT
DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
- round(avg(h.json->'$.e12[0]'),0) beam
+ avg(h.json->'$.e12[0]') beam
FROM history_hourly h
WHERE h.mac in
<foreach item="item" collection="macs" index="index" open="(" separator="," close=")">#{item}</foreach>
--
Gitblit v1.8.0