From c386b102a2397d569131e3a459465ba84e2376be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Aug 2023 14:27:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-job/src/main/java/com/moral/api/controller/PubController.java |   15 +++++++++++++++
 1 files changed, 15 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..3a54e5b 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;
 
@@ -72,6 +75,12 @@
         return new ResultMessage();
     }
 
+    @GetMapping("insertHCHistoryAqi")
+    @ApiOperation(value = "������������", notes = "������������")
+    public ResultMessage insertHCHistoryAqi() {
+        historyAqiService.insertHCHistoryAqi();
+        return new ResultMessage();
+    }
     @GetMapping("dateToChangShu")
     @ApiOperation(value = "������������������", notes = "������������������")
     public ResultMessage dateToChangShu() {
@@ -85,6 +94,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