From df67fe187fae9ce9f486ea2f14c95a14d843e4a1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 14:23:56 +0800
Subject: [PATCH] fix：增加导出功能
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 18 ++++++++++++++++--
1 files changed, 16 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 3a54e5b..09f93e1 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
@@ -44,6 +44,8 @@
private HistoryAqiService historyAqiService;
@Autowired
private HistoryHourlyService historyHourlyService;
+ @Autowired
+ private HistoryMonthlyService historyMonthlyService;
@GetMapping("insertHistoryDaily")
@ApiOperation(value = "���������������", notes = "���������������")
@@ -57,7 +59,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,8 +77,8 @@
@GetMapping("insertHistoryAqi")
@ApiOperation(value = "������������������", notes = "������������������")
- public ResultMessage insertHistoryAqi() {
- historyAqiService.insertHistoryAqi();
+ public ResultMessage insertHistoryAqi(String time) {
+ historyAqiService.insertHistoryAqi(time);
return new ResultMessage();
}
@@ -101,6 +108,13 @@
return new ResultMessage();
}
+ @GetMapping("insertHistoryMonthly")
+ @ApiOperation(value = "���������", notes = "���������")
+ public ResultMessage insertHistoryMonthly() {
+ historyMonthlyService.insertHistoryMonthly();
+ return new ResultMessage();
+ }
+
public static void main(String[] args) {
String host = "https://pair.market.alicloudapi.com";
--
Gitblit v1.8.0