From dcd1f53f7cde02a411d9767e6edbe612e4178d3d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 25 Jan 2021 10:45:01 +0800
Subject: [PATCH] 和风天气接口更改失败状态显示
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 2c9a0ed..56b5468 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -67,13 +67,13 @@
ks.put("cityCode", 320583);
ks.put("cityId", 101190404);
cityList.add(ks);
- int count = 0;
+ int state = 200;
for (Map<String, Object> map : cityList) {
String cityCode = map.get("cityCode").toString();
String id = map.get("cityId").toString();
Map<String, Object> dataMap = restTemplate.getForObject("https://api.heweather.net/v7/weather/72h?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, id);
- if (dataMap == null) {
- return count;
+ if (!dataMap.get("code").equals("200")) {
+ return 500;
}
String json = JSONObject.toJSONString(dataMap);
dataMap = (Map<String, Object>) JSONObject.parse(json);
@@ -261,9 +261,9 @@
parameters.put("end", c.getTime());
parameters.put("cityCode", cityCode);
weatherMapper.deleteByTime(parameters);
- count = count + weatherMapper.insertForecastWeather(resultList);
+ weatherMapper.insertForecastWeather(resultList);
}
- return count;
+ return state;
}
private List<Map<String, Object>> getSample(Map<String, Object> params, List<Integer> years) {
@@ -350,13 +350,13 @@
Date endTime = sdf.parse(sdf.format(c.getTime()));
c.add(Calendar.MONTH, -2);
Date startTime = sdf.parse(sdf.format(c.getTime()));
- int count = 0;
+ int state = 200;
List<Map<String, Object>> cityList = weatherMapper.getCityWeatherConfig();
for (Map<String, Object> map : cityList) {
String id = map.get("cityId").toString();
Map<String, Object> dataMap = restTemplate.getForObject("https://api.heweather.net/v7/weather/72h?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, id);
- if (dataMap == null) {
- return count;
+ if (!dataMap.get("code").equals("200")) {
+ return 500;
}
String json = JSONObject.toJSONString(dataMap);
dataMap = (Map<String, Object>) JSONObject.parse(json);
@@ -569,9 +569,9 @@
parameters.put("end", end);
parameters.put("cityCode", cityCode);
weatherMapper.deleteByTime(parameters);
- count = count + weatherMapper.insertForecastWeather(resultList);
+ weatherMapper.insertForecastWeather(resultList);
}
- return count;
+ return state;
}
@Override
@@ -583,12 +583,12 @@
Date now = sdf1.parse(sdf.format(c.getTime()) + ":00:00");
RestTemplate restTemplate = new RestTemplate();
List<Map<String, Object>> cityList = weatherMapper.getCityWeatherConfig();
- int count = 0;
+ int state = 200;
for (Map<String, Object> map : cityList) {
String id = map.get("cityId").toString();
Map<String, Object> dataMap = restTemplate.getForObject("https://api.heweather.net/v7/weather/now?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, id);
- if (dataMap == null) {
- return count;
+ if (!dataMap.get("code").equals("200")) {
+ return 500;
}
String json = JSONObject.toJSONString(dataMap);
dataMap = (Map<String, Object>) JSONObject.parse(json);
@@ -614,7 +614,8 @@
resultList.add(resultMap);
}
weatherMapper.deleteRealWeather(sdf1.format(now));
- return weatherMapper.insertRealWeather(resultList);
+ weatherMapper.insertRealWeather(resultList);
+ return state;
}
private int getWindScale(Double windSpeed) {
--
Gitblit v1.8.0