From f694728af353dcf32e270c0b1b27d81ba76fecd8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Sep 2020 10:51:51 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/mapper/RealWeatherMapper.java | 5 +++++
src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java | 14 ++++++++++++++
src/main/resources/mapper/RealWeatherMapper.xml | 15 +++++++++++++++
3 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/RealWeatherMapper.java b/src/main/java/com/moral/mapper/RealWeatherMapper.java
index c07f57b..83a5bf7 100644
--- a/src/main/java/com/moral/mapper/RealWeatherMapper.java
+++ b/src/main/java/com/moral/mapper/RealWeatherMapper.java
@@ -7,6 +7,8 @@
int insertRealWeather(List<Map<String, Object>> list);
+ void deleteRealWeather(String time);
+
List<Map<String, Object>> getTempAndCloud(Map<String, Object> params);
Map<String, Object> getDayData(Map<String, Object> params);
@@ -14,4 +16,7 @@
Map<String, Object> getTimeMaxTemp(Map<String, Object> params);
Map<String, Object> getTimeMinTemp(Map<String, Object> params);
+
+ List<Map<String, Object>> getWeatherByHour(Map<String, Object> params);
+
}
diff --git a/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java b/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
index 8615506..579fab6 100644
--- a/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
@@ -94,6 +94,19 @@
hashSet.add(hashMap);
}
+ Map<String, Object> smap = new HashMap<>();
+ smap.put("name1", "���������");
+ smap.put("parentName", "���������");
+ smap.put("cityCode", 320500);
+ smap.put("parentCode", 320000);
+ hashSet.add(smap);
+
+ Map<String, Object> bmap = new HashMap<>();
+ bmap.put("name1", "���������");
+ bmap.put("parentName", "���������");
+ bmap.put("cityCode", 110000);
+ bmap.put("parentCode", 110000);
+ hashSet.add(bmap);
Map<String,Object> kunShanMap=new HashMap<>();
kunShanMap.put("name1","���������");
kunShanMap.put("parentName","���������");
@@ -162,6 +175,7 @@
resultMap.put("json",JSONObject.toJSONString(jsonMap));
resultList.add(resultMap);
}
+ realWeatherMapper.deleteRealWeather(sdf1.format(now));
return realWeatherMapper.insertRealWeather(resultList);
}
}
diff --git a/src/main/resources/mapper/RealWeatherMapper.xml b/src/main/resources/mapper/RealWeatherMapper.xml
index eb6a031..8328fa8 100644
--- a/src/main/resources/mapper/RealWeatherMapper.xml
+++ b/src/main/resources/mapper/RealWeatherMapper.xml
@@ -13,6 +13,10 @@
</foreach>
</insert>
+ <delete id="deleteRealWeather">
+ delete from real_weather where time=#{time}
+ </delete>
+
<select id="getTempAndCloud" resultType="java.util.Map">
select DATE_FORMAT(time, #{typeFormat}) time,
json->'$.temp' 'temp',
@@ -71,4 +75,15 @@
and city_code=130900
) limit 0,1;
</select>
+
+ <select id="getWeatherByHour" resultType="java.util.Map">
+ select DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') time,
+ value
+ from history_weather_${timeUnits}
+ where city_code=#{cityCode}
+ and (
+ DATE_FORMAT(time, '%Y%H')=#{yearAndHour}
+ or DATE_FORMAT(time, '%Y%H')=#{yearAndHour1}
+ )
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0