From f060b03b65806b8ab1b869459942fa1f20641c9b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 12 Oct 2021 10:05:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 56b5468..cfec79c 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -348,7 +348,7 @@
RestTemplate restTemplate = new RestTemplate();
c.setTime(new Date());
Date endTime = sdf.parse(sdf.format(c.getTime()));
- c.add(Calendar.MONTH, -2);
+ c.add(Calendar.MONTH, -1);
Date startTime = sdf.parse(sdf.format(c.getTime()));
int state = 200;
List<Map<String, Object>> cityList = weatherMapper.getCityWeatherConfig();
@@ -514,8 +514,8 @@
sum2 = sum2 + temp * temp;
}
//������
- double cloud = Double.valueOf(listMap.get("cloud").toString().replace("\"", "").split("\\.")[0]);
- if (listMap.get("beam") != null) {
+ if (listMap.get("beam") != null&&listMap.get("cloud") != null) {
+ double cloud = Double.valueOf(listMap.get("cloud").toString().replace("\"", "").split("\\.")[0]);
double beam = Double.valueOf(listMap.get("beam").toString().replace("\"", "").split("\\.")[0]);
cloudSum = cloudSum + cloud;
beamSum = beamSum + beam;
--
Gitblit v1.8.0