From a5e4c4c7ffd5ad80c3d4b2f1fff69ce9b071bdcf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 四月 2026 14:58:08 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
index 23e0be2..ab82560 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
@@ -205,21 +205,23 @@
String key;
@ApiOperation(value = "获取天气信息", tags = {"内部-调价"})
- @GetMapping("/logan/inner/weatherInfo")
- public R<WeatherDTO> weather(@RequestParam String city) throws IOException {
-
- try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
- HttpGet httpGet = new HttpGet(String.format(WEATHER_URL, key, city));
- try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
- HttpEntity entity = response.getEntity();
- if (entity != null) {
- String resp = EntityUtils.toString(entity, StandardCharsets.UTF_8);
- System.out.println(resp);
- return R.ok(om.readValue(resp, WeatherDTO.class));
- }
- return R.fail("获取天气信息失败");
+ @PostMapping("/logan/inner/weatherInfo")
+ public R<WeatherDTO> wether(@RequestParam("cityCode") String cityCode) {
+ try{
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ HttpGet httpGet = new HttpGet(String.format(WEATHER_URL, key, cityCode));
+ CloseableHttpResponse response = httpClient.execute(httpGet);
+ HttpEntity entity = response.getEntity();
+ if (entity != null) {
+ String resp = EntityUtils.toString(entity, StandardCharsets.UTF_8);
+ log.info("天气预报查询结果：{}", resp);
+ return R.ok(om.readValue(resp, WeatherDTO.class));
}
+ return R.fail("获取天气信息失败");
+ }catch (Exception e){
+ e.printStackTrace();
}
+ return R.fail("获取天气信息失败");
}
}
--
Gitblit v1.7.1