From 7e2f3abca2f5bb83459f809b8e7195b361e0a372 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 12:00:30 +0800
Subject: [PATCH] ci:补充提交

---
 screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java |  103 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 92 insertions(+), 11 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java b/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
index fcc205c..4c7b3a7 100644
--- a/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
@@ -3,28 +3,35 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSON;
-import com.moral.api.entity.HistoryDaily;
 import com.moral.api.service.HistoryDailyService;
 import com.moral.api.service.HistoryFiveMinutelyService;
+import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.service.HistoryMonthlyService;
+import com.moral.api.service.HistoryWeeklyService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
+
+import javax.xml.crypto.Data;
+import java.util.Date;
 
 @Component
 public class HistoryTableInsertTask {
 
     @Autowired
+    private HistoryFiveMinutelyService historyFiveMinutelyService;
+
+    @Autowired
+    private HistoryHourlyService historyHourlyService;
+
+    @Autowired
     private HistoryDailyService historyDailyService;
 
     @Autowired
-    private HistoryFiveMinutelyService historyFiveMinutelyService;
+    private HistoryWeeklyService historyWeeklyService;
+
+    @Autowired
+    private HistoryMonthlyService historyMonthlyService;
 
     //5������������������
     @XxlJob("insertHistoryFiveMinutely")
@@ -33,7 +40,7 @@
             historyFiveMinutelyService.insertHistoryFiveMinutely();
         } catch (Exception e) {
             XxlJobHelper.log(e.getMessage());
-            return ReturnT.FAIL;
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
         }
         return ReturnT.SUCCESS;
     }
@@ -42,11 +49,85 @@
     @XxlJob("insertHistoryDaily")
     public ReturnT insertHistoryDaily() {
         try {
-            historyDailyService.insertHistoryDaily();
+            Date now = new Date();
+            historyDailyService.insertHistoryDaily(null);
         } catch (Exception e) {
             XxlJobHelper.log(e.getMessage());
             return ReturnT.FAIL;
         }
         return ReturnT.SUCCESS;
     }
+
+    //���������������
+    @XxlJob("insertHistoryWeekly")
+    public ReturnT insertHistoryWeekly() {
+        try {
+            historyWeeklyService.insertHistoryWeekly();
+        } catch (Exception e) {
+            XxlJobHelper.log(e.getMessage());
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    //���������������
+    @XxlJob("insertHistoryMonthly")
+    public ReturnT insertHistoryMonthly() {
+        try {
+            historyMonthlyService.insertHistoryMonthly();
+        } catch (Exception e) {
+            XxlJobHelper.log(e.getMessage());
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    //������������������������
+    @XxlJob("historyHourlySupplement")
+    public ReturnT historyHourlySupplement() {
+        try {
+            historyHourlyService.insertHistoryHourly();
+        } catch (Exception e) {
+            XxlJobHelper.log(e.getMessage());
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    //���������������������������������������������������������������
+    @XxlJob("insertHistoryHourlyComplete")
+    public ReturnT insertHistoryHourlyComplete(){
+        try {
+            historyHourlyService.insertHistoryHourlyComplete();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    @XxlJob("dateToChangShu")
+    public ReturnT dateToChangShu(){
+        try {
+            historyHourlyService.dateToChangShu(null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    //������������������������
+    @XxlJob("dateInsertHistoryHourlyAvg")
+    public ReturnT dateInsertHistoryHourlyAvg(){
+        try {
+            historyHourlyService.dateInsertHistoryHourlyAvg();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+        }
+        return ReturnT.SUCCESS;
+    }
+
+
 }

--
Gitblit v1.8.0