From 186ec9dcec258b3cead27c6874a828b9f48e1c8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 28 Aug 2020 13:55:15 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index c3e539c..667a819 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -653,6 +653,14 @@
if (nowHour < 8) {
return resultList;
}
+
+ if (nowMinute >= 46) {
+ nowHour = nowHour + 1;
+ cal.setTime(now);
+ cal.add(Calendar.HOUR_OF_DAY,1);
+ format=sdf1.format(cal.getTime()).substring(0, 13) + ":00:00";
+ }
+
for (Map<String, Object> resultMap : resultList) {
if (resultMap.get("type").equals("������")) {
if (sdf.parse(time).getTime() == sdf.parse(sdf.format(now)).getTime()) {
@@ -668,10 +676,6 @@
hashMap.put("end", endTime);
if (rhour == 0) {
rhour = 24;
- }
-
- if (nowMinute >= 46) {
- nowHour = nowHour + 1;
}
if (rhour == nowHour) {
@@ -771,4 +775,5 @@
}
}
}
+
}
--
Gitblit v1.8.0