From cbcbb9aa45d119bced3d52d5370e14138372fcdb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Sep 2020 11:30:19 +0800
Subject: [PATCH] windSpeed单位km/h->m/s
---
src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java b/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
index f1f07f7..9b1de42 100644
--- a/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
+import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -51,6 +52,7 @@
@Override
public int insertRealWeather() throws ParseException {
+ DecimalFormat df = new DecimalFormat("0.0");
Calendar c = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -93,6 +95,26 @@
hashMap.put("cityCode", code);
hashSet.add(hashMap);
}
+
+ Map<String, Object> smap = new HashMap<>();
+ smap.put("name1", "���������");
+ smap.put("parentName", "���������");
+ smap.put("cityCode", 320500);
+ smap.put("parentCode", 320000);
+ hashSet.add(smap);
+
+ Map<String, Object> bmap = new HashMap<>();
+ bmap.put("name1", "���������");
+ bmap.put("parentName", "���������");
+ bmap.put("cityCode", 110000);
+ bmap.put("parentCode", 110000);
+ hashSet.add(bmap);
+ Map<String,Object> kunShanMap=new HashMap<>();
+ kunShanMap.put("name1","���������");
+ kunShanMap.put("parentName","���������");
+ kunShanMap.put("cityCode",320500);
+ hashSet.add(kunShanMap);
+
List<Element> elements = Dom4jUtils.readDocument();
String cityID = "101190404";
for (Map<String, Object> map : hashSet) {
@@ -136,6 +158,11 @@
resultMap.put("cityCode",map.get("cityCode").toString());
resultMap.put("time",now);
Map<String, Object> jsonMap = (Map<String, Object>) map.get("data");
+
+ //������km/h->m/s
+ Double windSpeed = Double.valueOf(jsonMap.get("windSpeed").toString());
+ windSpeed = windSpeed * 1000 / 3600;
+ jsonMap.put("windSpeed",df.format(windSpeed));
jsonMap.remove("obsTime");
jsonMap.remove("icon");
String text = jsonMap.get("text").toString();
@@ -145,7 +172,7 @@
jsonMap.put("condition","80");
}else if(text.equals("���")){
jsonMap.put("condition","60");
- }else if(text.equals("���������")){
+ }else if(text.equals("���������")||text.equals("������")){
jsonMap.put("condition","40");
}else if(text.equals("������")){
jsonMap.put("condition","20");
@@ -155,6 +182,7 @@
resultMap.put("json",JSONObject.toJSONString(jsonMap));
resultList.add(resultMap);
}
- return realWeatherMapper.insertRealWeather(null);
+ realWeatherMapper.deleteRealWeather(sdf1.format(now));
+ return realWeatherMapper.insertRealWeather(resultList);
}
}
--
Gitblit v1.8.0