From 4b4a35fc7cc56a8b304ca35f0a9ec0bdd2e0e036 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Apr 2024 11:41:48 +0800
Subject: [PATCH] fix:路径规划补充提交
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 c29aa7e..bf074cd 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
@@ -21,7 +21,6 @@
import javax.mail.MessagingException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.nio.file.Files;
import java.util.*;
/**
@@ -56,9 +55,11 @@
private DeviceService deviceService;
private final EmailSpringUtil emailSpringUtil;
+ private final CityWeatherForecastService cityWeatherForecastService;
- public PubController(EmailSpringUtil emailSpringUtil) {
+ public PubController(EmailSpringUtil emailSpringUtil, CityWeatherForecastService cityWeatherForecastService) {
this.emailSpringUtil = emailSpringUtil;
+ this.cityWeatherForecastService = cityWeatherForecastService;
}
@GetMapping("insertHistoryDaily")
@@ -85,12 +86,23 @@
@GetMapping("dateInsertHistoryHourlyJKAvg")
@ApiOperation(value = "������������������������", notes = "������������������������")
public ResultMessage dateInsertHistoryHourlyJKAvg(String start,String end) {
+ Date ks = DateUtils.getDate(start,"yyyy-MM-dd HH:mm:ss");
+ Date js = DateUtils.getDate("2024-01-23 13:00:00","yyyy-MM-dd HH:mm:ss");
+ Date ends = DateUtils.getDate(end,"yyyy-MM-dd HH:mm:ss");
+ while (DateUtils.isTimeBefor(js,ks)){
+ String dateString = DateUtils.dateToDateString(ks);
+ String dateString1 = DateUtils.dateToDateString(ends);
+// historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+ historyHourlyService.dateInsertHistoryHourlyJKAvg(dateString, dateString1);
+ ks = DateUtils.getDateAddHour(ks,1);
+ ends = DateUtils.getDateAddHour(ends,1);
+ }
// 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();
}
@@ -134,6 +146,13 @@
return new ResultMessage();
}
+ @GetMapping("insertCityWeatherForecast")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ public ResultMessage insertCityWeatherForecast() {
+ cityWeatherForecastService.insertCityWeatherForecast();
+ return new ResultMessage();
+ }
+
@GetMapping("insertHistoryMonthly")
@ApiOperation(value = "���������", notes = "���������")
public ResultMessage insertHistoryMonthly() {
--
Gitblit v1.8.0