From 76ae6327de536de5c7a72332c396b64851899b75 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 11 Dec 2023 10:19:38 +0800
Subject: [PATCH] chore:测试提交

---
 screen-job/src/main/java/com/moral/api/controller/PubController.java |   12 ++++++++++++
 1 files changed, 12 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..8e734be 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,18 @@
         return new ResultMessage();
     }
 
+    @GetMapping("dateInsertHistoryHourlyJKAvg")
+    @ApiOperation(value = "������������", notes = "������������")
+    public ResultMessage dateInsertHistoryHourlyJKAvg(String start, String end) {
+        String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
+//        String start ="2023-11-19 09:00";
+//        String end ="2023-11-19 10:00";
+//        Date start = DateUtils.getDate(s,format);
+//        Date end = DateUtils.getDate(s1,format);
+        historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+        return new ResultMessage();
+    }
+
     @GetMapping("FiveMinutelyTest")
     @ApiOperation(value = "5������������1", notes = "5������������1")
     public ResultMessage FiveMinutelyTest(String yz,String mac) {

--
Gitblit v1.8.0