From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 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 0baea6a..d07822d 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;
@@ -22,11 +24,33 @@
@Autowired
private CityAqiService cityAqiService;
+ @Autowired
+ private CityAqiMonthlyService cityAqiMonthlyService;
+
+ @Autowired
+ private CityAqiYearlyService cityAqiYearlyService;
+
+ @XxlJob("insertHistoryAqisss")
+ public ReturnT insertHistoryAqisss() {
+ System.out.println("���������job");
+ return ReturnT.SUCCESS;
+ }
//���������aqi������������������
@XxlJob("insertHistoryAqi")
public ReturnT insertHistoryAqi() {
try {
- historyAqiService.insertHistoryAqi();
+ historyAqiService.insertHistoryAqi(null);
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ @XxlJob("insertHCHistoryAqi")
+ public ReturnT insertHCHistoryAqi() {
+ try {
+ historyAqiService.insertHCHistoryAqi();
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
@@ -46,9 +70,9 @@
return ReturnT.SUCCESS;
}
- //���������aqi���������������
+ //������aqi���������������
@XxlJob("insertCityAqiDaily")
- public ReturnT insertCityAqiDaily(){
+ public ReturnT insertCityAqiDaily() {
try {
cityAqiDailyService.insertCityAqiDaily();
} catch (Exception e) {
@@ -57,4 +81,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