From 55a4c66a1c3d0e9eed09d1832892c27bc62e1ecb Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Wed, 2 Feb 2022 22:15:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/layout/components/Navbar.vue        |  2 +-
 .../statistics/weatherstatistics/index.vue       |  4 ++--
 .../weather/service/impl/WeatherServiceImpl.java | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index ef0e2d98..42d4f928 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -275,7 +275,7 @@ export default {
 
 <style lang="scss" scoped>
 .weather {
-  width: 125px;
+  width: 126px;
   margin-right: 2px;
   cursor: pointer;
 }
diff --git a/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue b/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
index 3f9f2798..5b9e0e7a 100644
--- a/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
+++ b/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
@@ -114,7 +114,7 @@ export default {
       let historyChart = echarts.init(this.$refs.historyChart)
       historyChart.setOption({
         title: {
-          text: '天气（单位℃）',
+          text: '天气(单位℃)'+'-'+this.historyWeatherData.city[0],
           textStyle: {
             color: '#541264',
             fontWeight: '1000',
@@ -148,7 +148,7 @@ export default {
       let futureChart = echarts.init(this.$refs.futureChart)
       futureChart.setOption({
         title: {
-          text: '预报天气（单位℃）',
+          text: '预报天气(单位℃)'+'-'+this.futureWeatherData.city[0],
           textStyle: {
             color: '#541264',
             fontWeight: '1000',
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/service/impl/WeatherServiceImpl.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/service/impl/WeatherServiceImpl.java
index bf186ad2..20424aee 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/service/impl/WeatherServiceImpl.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/service/impl/WeatherServiceImpl.java
@@ -100,7 +100,13 @@ public class WeatherServiceImpl implements WeatherService {
         ArrayList<String> dateTime = new ArrayList<>();
         ArrayList<String> temperature = new ArrayList<>();
         weatherList.forEach(weather -> {
-            dateTime.add(DateUtil.format(weather.getReporttime(), "MM-dd HH"));
+            String today = DateUtil.today();
+            if (StringUtils.contains(startDate, today) && StringUtils.contains(endDate,today)) {
+                dateTime.add(DateUtil.format(weather.getReporttime(), "HH:mm"));
+            } else {
+                dateTime.add(DateUtil.format(weather.getReporttime(), "MM-dd"));
+
+            }
             temperature.add(weather.getTemperature());
         });
 
@@ -108,6 +114,10 @@ public class WeatherServiceImpl implements WeatherService {
         listMap.put("reportTime", dateTime);
         listMap.put("temperature", temperature);
 
+        ArrayList<String> cityList = new ArrayList<>();
+        cityList.add(city);
+        listMap.put("city", cityList);
+
         return listMap;
     }
 
@@ -130,6 +140,10 @@ public class WeatherServiceImpl implements WeatherService {
         listMap.put("week", week);
         listMap.put("minTemperature", minTemperature);
         listMap.put("maxTemperature", maxTemperature);
+        ArrayList<String> cityList = new ArrayList<>();
+        cityList.add(forecastWeather.getCity());
+        listMap.put("city", cityList);
+
         return listMap;
     }