From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/WeatherService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/WeatherService.java b/src/main/java/com/moral/service/WeatherService.java
index 8e6e2ea..328b4b3 100644
--- a/src/main/java/com/moral/service/WeatherService.java
+++ b/src/main/java/com/moral/service/WeatherService.java
@@ -10,6 +10,12 @@
 	
 	Map<String, Object> get15DayWeatherDataByRegion(Map<String, Object> parameters);
 
-	List<Map<String, Object>> getNextDayWeatherDataByRegion(Map<String, Object> parameters) throws ParseException;
+	List<Map<String, Object>> getForecastAndReal(Map<String, Object> parameters) throws ParseException;
+
+	List<Map<String, Object>> getWeatherData(Map<String, Object> parameters) throws ParseException;
+
+	List<Map<String, Object>> getWeatherDataByDay(Map<String, Object> parameters) throws ParseException;
+
+	void updateForecastWeather(Map<String, Object> parameters);
 
 }

--
Gitblit v1.8.0