From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-job/src/main/java/com/moral/api/controller/PubController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 d6fab21..cb46262 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
@@ -126,6 +126,13 @@
         return new ResultMessage();
     }
 
+    @GetMapping("insertHistoryHourly")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    public ResultMessage insertHistoryHourly() {
+        historyHourlyService.insertHistoryHourly();
+        return new ResultMessage();
+    }
+
     @GetMapping("insertHCHistoryAqi")
     @ApiOperation(value = "������������", notes = "������������")
     public ResultMessage insertHCHistoryAqi() {
@@ -169,8 +176,8 @@
     @GetMapping("secondCruiserSort")
     @ApiOperation(value = "���������������", notes = "���������������")
     public ResultMessage secondCruiserSort() {
-        String startTime ="2024-06-06 00:07:01";
-        String endTime ="2024-06-06 23:07:01";
+        String startTime ="2024-11-13 00:00:00";
+        String endTime ="2024-11-14 00:00:00";
         historySecondCruiserService.sort(startTime,endTime);
         return new ResultMessage();
     }

--
Gitblit v1.8.0