From 68e750bf109efb0469704e54e48a29649512358c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 18 Dec 2023 13:31:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java
index feb87a3..b8d827f 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java
@@ -40,6 +40,8 @@
@Autowired
private CityWeatherForecastMapper cityWeatherForecastMapper;
+
+ //���������������������������������������������������������������������������������72������������������
@Override
public void insertCityWeatherForecast() {
Date nextDay = DateUtils.addDays(new Date(), 1);
@@ -50,7 +52,7 @@
List<CityConfigWeatherForecast> list = cityConfigWeatherForecastService.list(wrapper);
List<CityWeatherForecast> cityWeatherForecasts = new ArrayList<>();
- CityWeatherForecast cityWeatherForecast = new CityWeatherForecast();
+
for (CityConfigWeatherForecast cityConfigWeatherForecast : list) {
Integer cityCode = cityConfigWeatherForecast.getCityCode();
Integer locationId = cityConfigWeatherForecast.getLocationId();
@@ -61,6 +63,7 @@
String dayTime = fxTime.split("T")[0];
if (dayTime.equals(nextTime)) {
String hourTime = fxTime.substring(0, 17).replaceAll("T", " ");
+ CityWeatherForecast cityWeatherForecast = new CityWeatherForecast();
cityWeatherForecast.setCityCode(cityCode);
cityWeatherForecast.setTime(DateUtils.getDate(hourTime, DateUtils.yyyy_MM_dd_HH_EN));
cityWeatherForecast.setValue(JSONObject.toJSONString(hourlyMap));
@@ -70,4 +73,16 @@
}
cityWeatherForecastMapper.insertCityWeatherForecast(cityWeatherForecasts);
}
+
+ public static void main(String[] args) {
+ String time = "20221231";
+ long currentMils = DateUtils.getDate(time, DateUtils.yyyyMMdd_EN).getTime();
+
+ long startMils = DateUtils.getDate("2022", DateUtils.yyyy).getTime();
+ long mss = currentMils - startMils;
+ long days = mss / (1000 * 60 * 60 * 24);
+ System.out.println(days + 1);
+
+
+ }
}
--
Gitblit v1.8.0