From bc6aaea416da40038dee2df1b3de4a1581da2a48 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Jul 2020 10:07:44 +0800
Subject: [PATCH] 臭氧预测update，根据城市名查询预测和实际数据
---
src/main/resources/mapper/RealTimeWeatherMapper.xml | 20 ++
src/main/java/com/moral/mapper/ForecastWeatherMapper.java | 11 +
src/main/resources/mapper/HangzhouAqiMapper.xml | 28 +++
src/main/resources/mapper/AreaMapper.xml | 5
src/main/java/com/moral/mapper/RealTimeWeatherMapper.java | 9 +
src/main/java/com/moral/mapper/MonitorPointMapper.java | 7
src/main/java/com/moral/mapper/ProvinceMapper.java | 4
src/main/java/com/moral/entity/RealTimeWeather.java | 17 +
src/main/resources/mapper/ForecastWeatherMapper.xml | 25 ++
src/main/java/com/moral/entity/ForecastWeather.java | 19 ++
src/main/resources/mapper/MonitorPointMapper.xml | 11 +
src/main/resources/mapper/ProvinceMapper.xml | 5
src/main/java/com/moral/mapper/AreaMapper.java | 5
src/main/resources/mapper/CityMapper.xml | 5
src/main/java/com/moral/mapper/CityMapper.java | 4
src/main/java/com/moral/service/WeatherService.java | 4
src/main/java/com/moral/controller/ScreenController.java | 24 ++
src/main/java/com/moral/mapper/HangzhouAqiMapper.java | 3
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 305 ++++++++++++++++++++++-----------
19 files changed, 399 insertions(+), 112 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 87e0182..0f33018 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -77,11 +77,13 @@
import com.moral.util.TempAllocationUtils;
import com.moral.util.mapUtils;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import net.sf.json.JSONString;
+
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.net.ftp.FTPClient;
@@ -1964,15 +1966,27 @@
return params;
}
- @GetMapping("weather_nextDay")
- @ApiOperation(value = "������������������������", notes = "������������������������")
+ @GetMapping("forecastO3")
+ @ApiOperation(value = "���������������������������", notes = "���������������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "monitorPointId", defaultValue = "6", value = "���������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
public ResultBean<List<Map<String, Object>>> getWeatherNextDayDataByRegion(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- parameters.put("typeFormat", "%Y-%m-%d %H");
- List<Map<String, Object>> resultList = weatherService.getNextDayWeatherDataByRegion(parameters);
+ parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
+ List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
return new ResultBean<List<Map<String, Object>>>(resultList);
}
+
+ @GetMapping("weatherData")
+ @ApiOperation(value = "������city���������������������������", notes = "������city���������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> getWeatherData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
+ List<Map<String, Object>> weatherList = weatherService.getWeatherData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(weatherList);
+ }
}
diff --git a/src/main/java/com/moral/entity/ForecastWeather.java b/src/main/java/com/moral/entity/ForecastWeather.java
new file mode 100644
index 0000000..d61c829
--- /dev/null
+++ b/src/main/java/com/moral/entity/ForecastWeather.java
@@ -0,0 +1,19 @@
+package com.moral.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+import javax.persistence.Id;
+
+@Data
+public class ForecastWeather {
+ @Id
+ private Integer monitorPointId;
+
+ private Date time;
+
+ private String json;
+
+ private String result;
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/entity/RealTimeWeather.java b/src/main/java/com/moral/entity/RealTimeWeather.java
new file mode 100644
index 0000000..cbf93d7
--- /dev/null
+++ b/src/main/java/com/moral/entity/RealTimeWeather.java
@@ -0,0 +1,17 @@
+package com.moral.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+import javax.persistence.Id;
+
+@Data
+public class RealTimeWeather {
+ @Id
+ private Integer monitorPointId;
+
+ private Date time;
+
+ private String json;
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/AreaMapper.java b/src/main/java/com/moral/mapper/AreaMapper.java
index 681ad1f..c381477 100644
--- a/src/main/java/com/moral/mapper/AreaMapper.java
+++ b/src/main/java/com/moral/mapper/AreaMapper.java
@@ -1,7 +1,12 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Area;
public interface AreaMapper extends BaseMapper<Area> {
+
+ Area getAreaByName(@Param(value="name") String name);
+
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/CityMapper.java b/src/main/java/com/moral/mapper/CityMapper.java
index 751e95b..b732f71 100644
--- a/src/main/java/com/moral/mapper/CityMapper.java
+++ b/src/main/java/com/moral/mapper/CityMapper.java
@@ -1,7 +1,11 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.City;
public interface CityMapper extends BaseMapper<City> {
+
+ City getCityByName(@Param(value="name") String name);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/ForecastWeatherMapper.java b/src/main/java/com/moral/mapper/ForecastWeatherMapper.java
new file mode 100644
index 0000000..fe73bf0
--- /dev/null
+++ b/src/main/java/com/moral/mapper/ForecastWeatherMapper.java
@@ -0,0 +1,11 @@
+package com.moral.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ForecastWeatherMapper {
+
+ List<Map<String,Object>> getForecastHour(Map<String, Object> parameters);
+
+ List<Map<String,Object>> getForecast(Map<String, Object> parameters);
+}
diff --git a/src/main/java/com/moral/mapper/HangzhouAqiMapper.java b/src/main/java/com/moral/mapper/HangzhouAqiMapper.java
index 9a61b07..31f2878 100644
--- a/src/main/java/com/moral/mapper/HangzhouAqiMapper.java
+++ b/src/main/java/com/moral/mapper/HangzhouAqiMapper.java
@@ -18,4 +18,7 @@
List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters);
+ List<Map<String, Object>> getAqiDataByAreaCode(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getAqi(Map<String, Object> parameters);
}
diff --git a/src/main/java/com/moral/mapper/MonitorPointMapper.java b/src/main/java/com/moral/mapper/MonitorPointMapper.java
index 45146b0..5023af1 100644
--- a/src/main/java/com/moral/mapper/MonitorPointMapper.java
+++ b/src/main/java/com/moral/mapper/MonitorPointMapper.java
@@ -24,4 +24,11 @@
MonitorPoint getMonitorPointById(@Param("id") int id);
List<MonitorPoint> getMonitorPointListByAccountId(@Param("id") int id);
+
+ MonitorPoint getFirstMonitorPointByAreaCode(@Param("areaCode") int areaCode);
+
+ MonitorPoint getFirstMonitorPointByCityCode(@Param("cityCode") int cityCode);
+
+ MonitorPoint getFirstMonitorPointByProvinceCode(@Param("provinceCode") int provinceCode);
+
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/ProvinceMapper.java b/src/main/java/com/moral/mapper/ProvinceMapper.java
index b687207..ea902d2 100644
--- a/src/main/java/com/moral/mapper/ProvinceMapper.java
+++ b/src/main/java/com/moral/mapper/ProvinceMapper.java
@@ -1,7 +1,11 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Province;
public interface ProvinceMapper extends BaseMapper<Province> {
+
+ Province getProvinceByName(@Param(value="name") String name);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/RealTimeWeatherMapper.java b/src/main/java/com/moral/mapper/RealTimeWeatherMapper.java
new file mode 100644
index 0000000..9801ad6
--- /dev/null
+++ b/src/main/java/com/moral/mapper/RealTimeWeatherMapper.java
@@ -0,0 +1,9 @@
+package com.moral.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RealTimeWeatherMapper {
+
+ List<Map<String,Object>> getRealTimeWeather(Map<String, Object> parameters);
+}
diff --git a/src/main/java/com/moral/service/WeatherService.java b/src/main/java/com/moral/service/WeatherService.java
index 8e6e2ea..d65fd5b 100644
--- a/src/main/java/com/moral/service/WeatherService.java
+++ b/src/main/java/com/moral/service/WeatherService.java
@@ -10,6 +10,8 @@
Map<String, Object> get15DayWeatherDataByRegion(Map<String, Object> parameters);
- List<Map<String, Object>> getNextDayWeatherDataByRegion(Map<String, Object> parameters) throws ParseException;
+ List<Map<String, Object>> getForecastAndReal(Map<String, Object> parameters) throws ParseException;
+
+ List<Map<String, Object>> getWeatherData(Map<String, Object> parameters) throws ParseException;
}
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 8470077..66b3245 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -7,7 +7,6 @@
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -18,6 +17,7 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;
+import com.alibaba.fastjson.JSONObject;
import com.moral.common.util.Dom4jUtils;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Area;
@@ -25,11 +25,14 @@
import com.moral.entity.City;
import com.moral.entity.MonitorPoint;
import com.moral.entity.Organization;
+import com.moral.entity.Province;
import com.moral.mapper.AreaMapper;
import com.moral.mapper.CityMapper;
+import com.moral.mapper.ForecastWeatherMapper;
import com.moral.mapper.HangzhouAqiMapper;
import com.moral.mapper.MonitorPointMapper;
import com.moral.mapper.ProvinceMapper;
+import com.moral.mapper.RealTimeWeatherMapper;
import com.moral.service.OrganizationService;
import com.moral.service.WeatherService;
@@ -46,6 +49,9 @@
private MonitorPointMapper monitorPointMapper;
@Resource
+ private ForecastWeatherMapper forecastWeatherMapper;
+
+ @Resource
private AreaMapper areaMapper;
@Resource
@@ -53,6 +59,9 @@
@Resource
private ProvinceMapper provinceMapper;
+
+ @Resource
+ private RealTimeWeatherMapper realTimeWeatherMapper;
@Override
public Map<String, Object> getWeatherDataByRegion(Map<String, Object> parameters) {
@@ -156,125 +165,209 @@
}
@Override
- public List<Map<String, Object>> getNextDayWeatherDataByRegion(Map<String, Object> parameters) throws ParseException {
+ public List<Map<String, Object>> getForecastAndReal(Map<String, Object> parameters) throws ParseException {
String monitorPointId = parameters.get("monitorPointId").toString();
- MonitorPoint monitorPoint = monitorPointMapper.selectByPrimaryKey(Integer.valueOf(monitorPointId));
- Integer cityCode = monitorPoint.getCityCode();
- Integer areaCode = monitorPoint.getAreaCode();
- String name1 = "";
- String parentName = "";
- if (areaCode != null) {
- Area area = areaMapper.selectByPrimaryKey(areaCode);
- name1 = area.getAreaName();
- City city = cityMapper.selectByPrimaryKey(area.getCityCode());
- parentName = city.getCityName();
- if ("���������".equals(area.getAreaName())) {
- name1 = parentName;
- parentName = provinceMapper.selectByPrimaryKey(city.getProvinceCode()).getProvinceName();
- }
- } else {
- City city = cityMapper.selectByPrimaryKey(cityCode);
- name1 = city.getCityName();
- parentName = provinceMapper.selectByPrimaryKey(city.getProvinceCode()).getProvinceName();
- }
- List<Element> elements = Dom4jUtils.readDocument();
- String cityID = "101190404";
- for (Element element : elements) {
- String name2 = element.element("name").getText();
- if (name1.equals(name2)) {
- cityID = element.element("Fweathercn").getText();
- break;
- }
- if (name2.endsWith(name1)) {
- if (name2.startsWith(parentName)) {
- cityID = element.element("Fweathercn").getText();
- break;
- }
- }
- }
- RestTemplate restTemplate = new RestTemplate();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String time = parameters.get("time").toString() + " 00:00:00";
Calendar c = Calendar.getInstance();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH");
- String now = sdf.format(c.getTime());
- String selectTime = parameters.get("time").toString();
- Date t1 = sdf.parse(selectTime);
- Date t2 = sdf.parse(now);
+ c.setTime(sdf.parse(time));
+ c.add(Calendar.HOUR_OF_DAY, 1);
+ time = sdf.format(c.getTime());
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ String nextDay = sdf.format(c.getTime());
+ parameters.put("start", sdf.parse(time));
+ parameters.put("end", sdf.parse(nextDay));
+ List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);
+
+ MonitorPoint monitorPoint = monitorPointMapper.selectByPrimaryKey(Integer.valueOf(monitorPointId));
+ parameters.put("areaCode", monitorPoint.getAreaCode());
+ String sensors = "O3C";
+ String sensor1 = "O3";
+ parameters.put("sensors", sensors);
+ parameters.put("sensors1", sensor1);
+ parameters.put("sensors2", sensor1);
+ List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
+ if (aqiList.size() == 0) {
+ parameters.put("areaCode", monitorPoint.getCityCode());
+ aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
+ }
+
+ for (Map<String, Object> map : aqiList) {
+ String O3 = map.get("O3").toString().replace("\"", "");
+ map.put("O3", O3);
+ }
+
List<Map<String, Object>> resultList = new ArrayList<>();
- if (t1.getTime() > t2.getTime()) {
- parameters.put("now", now);
- Map<String, Object> map = restTemplate.getForObject("https://yiketianqi.com/api?version=v9&appid=68884517&appsecret=St9sFnvi&cityid={1}", Map.class, cityID);
- ArrayList<Map<String, Object>> dataList = (ArrayList<Map<String, Object>>) map.get("data");
- ArrayList<Map<String, Object>> arrayList = new ArrayList<>();
- String start = parameters.get("now").toString();
- String end = parameters.get("time").toString();
- for (Map<String, Object> dataMap : dataList) {
- String date = dataMap.get("date").toString();
- ArrayList<Map<String, Object>> list = (ArrayList<Map<String, Object>>) dataMap.get("hours");
- if (date.equals(start)) {
- for (int i = list.size() - 7; i < list.size(); i++) {
- Map<String, Object> resultMap = list.get(i);
- arrayList.add(resultMap);
- }
+ if (forecastList.size() == 0 && aqiList.size() == 0) {
+ return new ArrayList<>();
+ } else if (forecastList.size() == 0) {
+ for (Map<String, Object> aqiMap : aqiList) {
+ Map<String, Object> map = new HashMap<>();
+ List<String> values = new ArrayList<>();
+ String hour = aqiMap.get("time").toString().split(" ")[1].split(":")[0];
+ if (hour.equals("00")) {
+ hour = "24";
}
- if (date.equals(end)) {
- for (int i = 0; i < 17; i++) {
- Map<String, Object> resultMap = list.get(i);
- arrayList.add(resultMap);
- }
- }
+ map.put("time", Integer.valueOf(hour));
+ values.add("");
+ values.add(aqiMap.get(sensor1).toString());
+ map.put("values", values);
+ resultList.add(map);
}
- for (Map<String, Object> resultMap : arrayList) {
- Map<String, Object> hashMap = new LinkedHashMap<>();
+ } else if (aqiList.size() == 0) {
+ for (Map<String, Object> forecastMap : forecastList) {
+ Map<String, Object> map = new HashMap<>();
List<String> values = new ArrayList<>();
- String hour = resultMap.get("hours").toString().replaceAll("[\u4e00-\u9fa5]+", "");
- values.add(resultMap.get("tem").toString());
- values.add("");
- hashMap.put("values", values);
- hashMap.put("time", Integer.valueOf(hour));
- if (Integer.valueOf(hour) == 0) {
- hashMap.put("time", 24);
+ String hour = forecastMap.get("time").toString().split(" ")[1].split(":")[0];
+ if (hour.equals("00")) {
+ hour = "24";
}
- resultList.add(hashMap);
+ map.put("time", Integer.valueOf(hour));
+ values.add(forecastMap.get("result").toString().replace("\"", ""));
+ values.add("");
+ map.put("values", values);
+ resultList.add(map);
}
} else {
- parameters.put("start", selectTime);
- c.setTime(sdf.parse(selectTime));
- c.add(Calendar.DAY_OF_MONTH, 1);
- c.add(Calendar.HOUR_OF_DAY, 1);
- String end = sdf1.format(c.getTime());
- parameters.put("end", end);
- parameters.put("sensors", "O3C");
- parameters.put("sensors1", "O3");
- parameters.put("sensors2", parameters.get("sensors1").toString());
- List<Map<String, Object>> areaList = new ArrayList<>();
- if (areaCode == null) {
- parameters.put("areaCode", cityCode);
- areaList = hangzhouAqiMapper.getAreaAvgDataByAreaCode(parameters);
- } else {
- parameters.put("areaCode", areaCode);
- areaList = hangzhouAqiMapper.getAreaAvgDataByAreaCode(parameters);
- if (areaList.size() == 0) {
- parameters.put("areaCode", cityCode);
- areaList = hangzhouAqiMapper.getAreaAvgDataByAreaCode(parameters);
- }
- }
- areaList.remove(0);
- for (Map<String, Object> areaMap : areaList) {
- Map<String, Object> hashMap = new LinkedHashMap<>();
+ for (Map<String, Object> forecastMap : forecastList) {
+ Map<String, Object> map = new HashMap<>();
List<String> values = new ArrayList<>();
- values.add("");
- values.add(areaMap.get("O3").toString());
- hashMap.put("values", values);
- String hour = areaMap.get("time").toString().split(" ")[1];
- hashMap.put("time", Integer.valueOf(hour));
- if (Integer.valueOf(hour) == 0) {
- hashMap.put("time", 24);
+ String hour = forecastMap.get("time").toString().split(" ")[1].split(":")[0];
+ if (hour.equals("00")) {
+ hour = "24";
}
- resultList.add(hashMap);
+ map.put("time", Integer.valueOf(hour));
+ values.add(forecastMap.get("result").toString().replace("\"", ""));
+ for (Map<String, Object> aqiMap : aqiList) {
+ if (forecastMap.get("time").equals(aqiMap.get("time"))) {
+ values.add(aqiMap.get(sensor1).toString());
+ }
+ }
+ map.put("values", values);
+ resultList.add(map);
}
}
+ for (Map<String, Object> resultMap : resultList) {
+ ArrayList<String> values = (ArrayList<String>) resultMap.get("values");
+ if (values.size() == 1) {
+ values.add("");
+ }
+ }
+ return resultList;
+ }
+
+ @Override
+ public List<Map<String, Object>> getWeatherData(Map<String, Object> parameters) throws ParseException {
+ String cityName = parameters.get("city").toString();
+ Area area = areaMapper.getAreaByName(cityName);
+ MonitorPoint monitorPoint;
+ Integer areaCode = 0;
+ Integer cityCode = 0;
+ if (area == null) {
+ City city = cityMapper.getCityByName(cityName);
+ if (city == null) {
+ Province province = provinceMapper.getProvinceByName(cityName);
+ Integer provinceCode = province.getProvinceCode();
+ monitorPoint = monitorPointMapper.getFirstMonitorPointByProvinceCode(provinceCode);
+ parameters.put("areaCode", provinceCode);
+ parameters.put("city", province.getProvinceName());
+ } else {
+ cityCode = city.getCityCode();
+ monitorPoint = monitorPointMapper.getFirstMonitorPointByCityCode(cityCode);
+ parameters.put("areaCode", cityCode);
+ parameters.put("city", city.getCityName());
+ }
+ } else {
+ areaCode = area.getAreaCode();
+ monitorPoint = monitorPointMapper.getFirstMonitorPointByAreaCode(areaCode);
+ cityCode = area.getCityCode();
+ parameters.put("areaCode", areaCode);
+ parameters.put("city", area.getAreaName());
+ }
+ if (monitorPoint == null) {
+ return new ArrayList<>();
+ }
+ parameters.put("monitorPointId", monitorPoint.getId());
+ String time = parameters.get("time").toString();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar c = Calendar.getInstance();
+ c.setTime(sdf.parse(time));
+ c.add(Calendar.HOUR_OF_DAY, 1);
+ Date start = c.getTime();
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ Date end = c.getTime();
+ parameters.put("start", start);
+ parameters.put("end", end);
+ List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecast(parameters);
+ List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
+ if (aqiList.size() == 0) {
+ parameters.put("areaCode", cityCode);
+ aqiList = hangzhouAqiMapper.getAqi(parameters);
+ }
+ List<Map<String, Object>> list1 = new ArrayList<>();
+ for (Map<String, Object> map : aqiList) {
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("time", map.get("time"));
+ Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(map.get("json").toString());
+ hashMap.putAll(jsonMap);
+ hashMap.put("city", parameters.get("city").toString());
+ list1.add(hashMap);
+ }
+
+ List<Map<String, Object>> realTimeList = realTimeWeatherMapper.getRealTimeWeather(parameters);
+ List<Map<String, Object>> realList = new ArrayList<>();
+ for (Map<String, Object> map : realTimeList) {
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("time", map.get("time"));
+ hashMap.put("type", "������");
+ hashMap.put("city", parameters.get("city").toString());
+ Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(map.get("json").toString());
+ hashMap.putAll(jsonMap);
+ realList.add(hashMap);
+ }
+
+ for (Map<String, Object> realTimeMap : realList) {
+ for (Map<String, Object> aqiMap : list1) {
+ if (aqiMap.get("time").equals(realTimeMap.get("time"))) {
+ realTimeMap.putAll(aqiMap);
+ }
+ }
+ }
+
+ List<Map<String, Object>> foreList = new ArrayList<>();
+ for (Map<String, Object> forecastMap : forecastList) {
+ Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(forecastMap.get("json").toString());
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("temp", jsonMap.get("tem"));
+ hashMap.put("windDir", jsonMap.get("win"));
+ hashMap.put("windLevel", jsonMap.get("win_speed"));
+ hashMap.put("condition", jsonMap.get("wea"));
+ hashMap.put("time", forecastMap.get("time").toString());
+ hashMap.put("type", "������");
+ hashMap.put("city", parameters.get("city").toString());
+ foreList.add(hashMap);
+ }
+
+ List<Map<String, Object>> resultList = new ArrayList<>();
+ for (Map<String, Object> foreMap : foreList) {
+ for (Map<String, Object> realMap : realList) {
+ if (foreMap.get("time").equals(realMap.get("time"))) {
+ resultList.add(foreMap);
+ resultList.add(realMap);
+ }
+ }
+ }
+
+ for (int i = realList.size(); i < forecastList.size(); i++) {
+ Map<String, Object> map = foreList.get(i);
+ resultList.add(map);
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("time", map.get("time").toString());
+ hashMap.put("type", "������");
+ hashMap.put("city", parameters.get("city").toString());
+ resultList.add(hashMap);
+ }
return resultList;
}
}
diff --git a/src/main/resources/mapper/AreaMapper.xml b/src/main/resources/mapper/AreaMapper.xml
index cd51923..2343107 100644
--- a/src/main/resources/mapper/AreaMapper.xml
+++ b/src/main/resources/mapper/AreaMapper.xml
@@ -6,4 +6,9 @@
<result column="area_name" property="areaName" jdbcType="VARCHAR" />
<result column="city_code" property="cityCode" jdbcType="INTEGER" />
</resultMap>
+
+ <select id="getAreaByName" resultType="com.moral.entity.Area" resultMap="BaseResultMap">
+ select * from area
+ where area_name like '%${name}%' limit 0,1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/CityMapper.xml b/src/main/resources/mapper/CityMapper.xml
index 3aafe3c..894c50d 100644
--- a/src/main/resources/mapper/CityMapper.xml
+++ b/src/main/resources/mapper/CityMapper.xml
@@ -6,4 +6,9 @@
<result column="city_name" property="cityName" jdbcType="VARCHAR" />
<result column="province_code" property="provinceCode" jdbcType="INTEGER" />
</resultMap>
+
+ <select id="getCityByName" resultType="com.moral.entity.City" resultMap="BaseResultMap">
+ select * from city
+ where city_name like '%${name}%' limit 0,1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/ForecastWeatherMapper.xml b/src/main/resources/mapper/ForecastWeatherMapper.xml
new file mode 100644
index 0000000..a0bf96d
--- /dev/null
+++ b/src/main/resources/mapper/ForecastWeatherMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.mapper.ForecastWeatherMapper">
+ <resultMap id="BaseResultMap" type="com.moral.entity.ForecastWeather">
+ <id column="monitor_point_id" property="monitorPointId" jdbcType="INTEGER"/>
+ </resultMap>
+ <select id="getForecastHour" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(time, #{typeFormat}) time,
+ (case when result is null then json->'$.tem' else result end) result
+ from forecast_weather
+ where time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ AND monitor_point_id=#{monitorPointId}
+ </select>
+
+ <select id="getForecast" resultType="java.util.Map">
+ SELECT DATE_FORMAT(time, #{typeFormat}) time,
+ json
+ from forecast_weather
+ where time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ AND monitor_point_id=#{monitorPointId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/HangzhouAqiMapper.xml b/src/main/resources/mapper/HangzhouAqiMapper.xml
index 26e4898..7f7912b 100644
--- a/src/main/resources/mapper/HangzhouAqiMapper.xml
+++ b/src/main/resources/mapper/HangzhouAqiMapper.xml
@@ -67,4 +67,32 @@
ORDER BY
time
</select>
+
+ <select id="getAqiDataByAreaCode" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(time, #{typeFormat}) time,
+ ifnull(aqi_json->'$.${sensors}',"") as '${sensors2}'
+ FROM
+ hangzhou_aqi ha
+ WHERE
+ ha.time >= #{start}
+ AND ha.time <![CDATA[<]]> #{end}
+ AND ha.city_code = #{areaCode}
+ ORDER BY
+ time
+ </select>
+
+ <select id="getAqi" resultType="java.util.Map">
+ select
+ DATE_FORMAT(time, #{typeFormat}) time,
+ aqi_json json
+ FROM
+ hangzhou_aqi
+ WHERE
+ time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ AND city_code = #{areaCode}
+ ORDER BY
+ time
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 0e45627..941d1b8 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -172,4 +172,15 @@
and a.id=#{id};
</select>
+ <select id="getFirstMonitorPointByAreaCode" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
+ select * from monitor_point where area_code=#{areaCode} limit 0,1
+ </select>
+
+ <select id="getFirstMonitorPointByCityCode" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
+ select * from monitor_point where city_code=#{cityCode} limit 0,1
+ </select>
+
+ <select id="getFirstMonitorPointByProvinceCode" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
+ select * from monitor_point where province_code=#{provinceCode} limit 0,1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/ProvinceMapper.xml b/src/main/resources/mapper/ProvinceMapper.xml
index f786f9e..0d41594 100644
--- a/src/main/resources/mapper/ProvinceMapper.xml
+++ b/src/main/resources/mapper/ProvinceMapper.xml
@@ -5,4 +5,9 @@
<id column="province_code" property="provinceCode" jdbcType="INTEGER" />
<result column="province_name" property="provinceName" jdbcType="VARCHAR" />
</resultMap>
+
+ <select id="getProvinceByName" resultType="com.moral.entity.Province" resultMap="BaseResultMap">
+ select * from province
+ where province_name like '%${name}%' limit 0,1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/RealTimeWeatherMapper.xml b/src/main/resources/mapper/RealTimeWeatherMapper.xml
new file mode 100644
index 0000000..855f42c
--- /dev/null
+++ b/src/main/resources/mapper/RealTimeWeatherMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.mapper.RealTimeWeatherMapper">
+ <resultMap id="BaseResultMap" type="com.moral.entity.RealTimeWeather">
+ <id column="monitor_point_id" property="monitorPointId" jdbcType="INTEGER"/>
+ </resultMap>
+ <select id="getRealTimeWeather" resultType="java.util.Map">
+ select
+ DATE_FORMAT(time, #{typeFormat}) time,
+ json
+ FROM
+ realtime_weather
+ WHERE
+ time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ AND monitor_point_id = #{monitorPointId}
+ ORDER BY
+ time
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0