From 59481e2c88aa090d4db633a6c61a1bcfd3dbe011 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 11 Dec 2023 10:02:47 +0800
Subject: [PATCH] chore:疾控中心小时数据接口提交
---
screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java | 3 +++
screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java | 13 +++++++++++++
screen-job/src/main/java/com/moral/api/controller/PubController.java | 12 ++++++++++++
3 files changed, 28 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) {
diff --git a/screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java
index b65b3d3..a67b9b6 100644
--- a/screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java
+++ b/screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java
@@ -46,5 +46,8 @@
//������������������������������
void dateInsertHistoryHourlyAvg();
+ //���������������������������������
+ void dateInsertHistoryHourlyJKAvg(String start,String end);
+
}
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 4c7b3a7..712369f 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
@@ -130,4 +130,17 @@
}
+ //������������������������������
+ @XxlJob("dateInsertHistoryHourlyJKAvg")
+ public ReturnT dateInsertJKAvg(){
+ try {
+ historyHourlyService.dateInsertHistoryHourlyJKAvg(null,null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+
}
--
Gitblit v1.8.0