From 1b45197a985684d930ee2ca58635d89bae6b6da8 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Sat, 08 Jul 2023 20:05:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl

---
 screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
index 3ed2628..5032f23 100644
--- a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
@@ -4,7 +4,9 @@
 import org.springframework.stereotype.Component;
 
 import com.moral.api.service.CityAqiDailyService;
+import com.moral.api.service.CityAqiMonthlyService;
 import com.moral.api.service.CityAqiService;
+import com.moral.api.service.CityAqiYearlyService;
 import com.moral.api.service.HistoryAqiService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobHelper;
@@ -21,6 +23,12 @@
 
     @Autowired
     private CityAqiService cityAqiService;
+
+    @Autowired
+    private CityAqiMonthlyService cityAqiMonthlyService;
+
+    @Autowired
+    private CityAqiYearlyService cityAqiYearlyService;
 
     //���������aqi������������������
     @XxlJob("insertHistoryAqi")
@@ -48,7 +56,7 @@
 
     //������aqi���������������
     @XxlJob("insertCityAqiDaily")
-    public ReturnT insertCityAqiDaily(){
+    public ReturnT insertCityAqiDaily() {
         try {
             cityAqiDailyService.insertCityAqiDaily();
         } catch (Exception e) {
@@ -57,4 +65,28 @@
         }
         return ReturnT.SUCCESS;
     }
+
+    //������aqi���������������
+    @XxlJob("insertCityAqiMonthly")
+    public ReturnT insertCityAqiMonthly() {
+        try {
+            cityAqiMonthlyService.insertCityAqiMonthly();
+        } catch (Exception e) {
+            XxlJobHelper.log(e.getMessage());
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    //������aqi���������������
+    @XxlJob("insertCityAqiYearly")
+    public ReturnT insertCityAqiYearly() {
+        try {
+            cityAqiYearlyService.insertCityAqiYearly();
+        } catch (Exception e) {
+            XxlJobHelper.log(e.getMessage());
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+        }
+        return ReturnT.SUCCESS;
+    }
 }

--
Gitblit v1.8.0