From fdef922f0f8adea77cfaee8194033b2947575fd2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:32:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 15 +++++++++++++--
1 files changed, 13 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 2ba44f4..190f76f 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
@@ -57,7 +57,12 @@
@GetMapping("insertHistoryFiveMinutely")
@ApiOperation(value = "5������������", notes = "5������������")
public ResultMessage insertHistoryFiveMinutely() {
+ String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
historyFiveMinutelyService.insertHistoryFiveMinutely();
+ String s ="2023-10-13 03:35";
+ String s1 ="2023-10-13 03:40";
+ Date start = DateUtils.getDate(s,format);
+ Date end = DateUtils.getDate(s1,format);
return new ResultMessage();
}
@@ -70,11 +75,17 @@
@GetMapping("insertHistoryAqi")
@ApiOperation(value = "������������������", notes = "������������������")
- public ResultMessage insertHistoryAqi() {
- historyAqiService.insertHistoryAqi();
+ public ResultMessage insertHistoryAqi(String time) {
+ historyAqiService.insertHistoryAqi(time);
return new ResultMessage();
}
+ @GetMapping("insertHCHistoryAqi")
+ @ApiOperation(value = "������������", notes = "������������")
+ public ResultMessage insertHCHistoryAqi() {
+ historyAqiService.insertHCHistoryAqi();
+ return new ResultMessage();
+ }
@GetMapping("dateToChangShu")
@ApiOperation(value = "������������������", notes = "������������������")
public ResultMessage dateToChangShu() {
--
Gitblit v1.8.0