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 |   18 +++++++++++++++++-
 1 files changed, 17 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 5032f23..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
@@ -30,11 +30,27 @@
     @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());

--
Gitblit v1.8.0