From 4f90163c268bdeb3f8233326f16cf21fe17a24c0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 23 Jan 2024 15:55:29 +0800
Subject: [PATCH] chore:疾控中心修改时间问题提交
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 606c6a3..59d40d1 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
@@ -34,6 +34,9 @@
private HistoryDailyService historyDailyService;
@Autowired
private HistoryFiveMinutelyService historyFiveMinutelyService;
+
+ @Autowired
+ private CityWeatherService cityWeatherService;
@Autowired
private ForecastService forecastService;
@@ -41,6 +44,8 @@
private HistoryAqiService historyAqiService;
@Autowired
private HistoryHourlyService historyHourlyService;
+ @Autowired
+ private HistoryMonthlyService historyMonthlyService;
@GetMapping("insertHistoryDaily")
@ApiOperation(value = "���������������", notes = "���������������")
@@ -54,7 +59,24 @@
@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();
+ }
+
+ @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 start1 = DateUtils.getDate(start,format);
+// Date end1 = DateUtils.getDate(end,format);
+ historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
return new ResultMessage();
}
@@ -67,11 +89,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() {
@@ -85,6 +113,19 @@
forecastService.forecastO3();
return new ResultMessage();
}
+ @GetMapping("insertCityWeather")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ public ResultMessage insertCityWeather() {
+ cityWeatherService.insertCityWeather();
+ return new ResultMessage();
+ }
+
+ @GetMapping("insertHistoryMonthly")
+ @ApiOperation(value = "���������", notes = "���������")
+ public ResultMessage insertHistoryMonthly() {
+ historyMonthlyService.insertHistoryMonthly();
+ return new ResultMessage();
+ }
public static void main(String[] args) {
--
Gitblit v1.8.0