From 5f591b85c57ec51e6899a23f2d594921d5fa9871 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 10 Sep 2020 15:54:23 +0800
Subject: [PATCH] update因子

---
 src/main/java/com/moral/service/impl/WeatherServiceImpl.java |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 3df2b4f..171dd63 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -16,6 +16,7 @@
 
 import javax.annotation.Resource;
 
+import org.apache.jasper.compiler.JspUtil;
 import org.dom4j.Element;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -416,6 +417,9 @@
         }
 
         String ac = parameters.get("cityCode").toString();
+        if(name.equals("���������")){
+            ac="130900";
+        }
         List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
         if (aqiList.size() == 0) {
             parameters.put("cityCode", code);
@@ -464,8 +468,8 @@
         } else {
             params.put("areaCode", Integer.valueOf(ac));
         }
-        List<MonitorPoint> monitorList = monitorPointMapper.getMonitorList(params);
 
+        List<MonitorPoint> monitorList = monitorPointMapper.getMonitorList(params);
         List<Integer> pointList = new ArrayList<>();
         for (MonitorPoint point : monitorList) {
             Integer pointId = point.getId();
@@ -792,4 +796,31 @@
         }
     }
 
+    @Override
+    public List<Map<String, Object>> getWeatherDataByDay(Map<String, Object> parameters) throws ParseException {
+        String selectTime = parameters.get("time").toString();
+        String cityName = parameters.get("city").toString();
+        Area area = areaMapper.getAreaByName(cityName);
+        Integer code;
+        String name;
+        if (area == null) {
+            City city = cityMapper.getCityByName(cityName);
+            if (city == null) {
+                Province province = provinceMapper.getProvinceByName(cityName);
+                code = province.getProvinceCode();
+                name = province.getProvinceName();
+            } else {
+                code = city.getCityCode();
+                name = city.getCityName();
+            }
+        } else {
+            code = area.getAreaCode();
+            name = area.getAreaName();
+        }
+
+        parameters.put("cityCode", code);
+        parameters.put("name", name);
+        return null;
+    }
+
 }

--
Gitblit v1.8.0