|
|
@@ -5,6 +5,7 @@ import cn.hutool.http.HttpRequest;
|
|
|
import cn.hutool.http.HttpResponse;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
@@ -23,8 +24,14 @@ import java.util.Map;
|
|
|
public class CommonController {
|
|
|
|
|
|
@GetMapping("/weather")
|
|
|
- public AjaxResult getWeather() {
|
|
|
- HttpResponse response = HttpRequest.get("https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/25.9645%2C119.2197?unitGroup=metric&elements=datetime%2Ctemp%2Cpreciptype&include=hours&key=PA6TZ5RK5NS48644CHCKX6FGK&contentType=json").execute();
|
|
|
+ public AjaxResult getWeather(@RequestParam(required = false) String latitude, @RequestParam(required = false) String longitude) {
|
|
|
+ if (latitude == null) {
|
|
|
+ latitude = "25.9645";
|
|
|
+ }
|
|
|
+ if (longitude == null) {
|
|
|
+ longitude = "119.2197";
|
|
|
+ }
|
|
|
+ HttpResponse response = HttpRequest.get("https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/" + latitude + "%2C" + longitude + "?unitGroup=metric&elements=datetime%2Ctemp%2Cpreciptype&include=hours&key=PA6TZ5RK5NS48644CHCKX6FGK&contentType=json").execute();
|
|
|
Map<String, String> map = new HashMap<>();
|
|
|
map.put("date", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
map.put("data", response.body());
|