From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb

---
 screen-job/src/main/java/com/moral/api/controller/PubController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index 606c6a3..2ba44f4 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -34,6 +34,9 @@
     private HistoryDailyService historyDailyService;
     @Autowired
     private HistoryFiveMinutelyService historyFiveMinutelyService;
+
+    @Autowired
+    private CityWeatherService cityWeatherService;
     @Autowired
     private ForecastService forecastService;
 
@@ -85,6 +88,12 @@
         forecastService.forecastO3();
         return new ResultMessage();
     }
+    @GetMapping("insertCityWeather")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    public ResultMessage insertCityWeather() {
+        cityWeatherService.insertCityWeather();
+        return new ResultMessage();
+    }
 
 
     public static void main(String[] args) {

--
Gitblit v1.8.0