From cad99191f5e0f20d303313a6dd60b86d1d1f0517 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 26 Jan 2024 09:52:25 +0800
Subject: [PATCH] chore:测试代码提交

---
 screen-job/src/main/java/com/moral/api/controller/PubController.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 09f93e1..822ed13 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
@@ -68,6 +68,29 @@
         return new ResultMessage();
     }
 
+    @GetMapping("dateInsertHistoryHourlyJKAvg")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    public ResultMessage dateInsertHistoryHourlyJKAvg(String start,String end) {
+        Date ks = DateUtils.getDate(start,"yyyy-MM-dd HH:mm:ss");
+        Date js = DateUtils.getDate("2024-01-23 13:00:00","yyyy-MM-dd HH:mm:ss");
+        Date ends = DateUtils.getDate(end,"yyyy-MM-dd HH:mm:ss");
+        while (DateUtils.isTimeBefor(js,ks)){
+            String dateString = DateUtils.dateToDateString(ks);
+            String dateString1 = DateUtils.dateToDateString(ends);
+//            historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+            historyHourlyService.dateInsertHistoryHourlyJKAvg(dateString, dateString1);
+            ks = DateUtils.getDateAddHour(ks,1);
+            ends = DateUtils.getDateAddHour(ends,1);
+        }
+//        String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
+//        String start ="2023-11-19 09:00"
+//        String end ="2023-11-19 10:00";
+//        Date start1 = DateUtils.getDate(start,format);
+//        Date end1 = DateUtils.getDate(end,format);
+
+        return new ResultMessage();
+    }
+
     @GetMapping("FiveMinutelyTest")
     @ApiOperation(value = "5������������1", notes = "5������������1")
     public ResultMessage FiveMinutelyTest(String yz,String mac) {

--
Gitblit v1.8.0