From dad714704451fbcc04b48d4efcb460410e7a8aa0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 19 Aug 2020 14:47:32 +0800
Subject: [PATCH] update

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

diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 3d8bf05..fb15d94 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.moral.service.impl;
 
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -233,8 +234,8 @@
                     hour = "24";
                 }
                 map.put("time", Integer.valueOf(hour));
-                if (forecastMap.get("result") != null) {
-                    values.add(forecastMap.get("result").toString().replace("\"", ""));
+                if (forecastMap.get("O3") != null) {
+                    values.add(forecastMap.get("O3").toString().replace("\"", ""));
                 } else {
                     values.add("");
                 }
@@ -251,8 +252,8 @@
                     hour = "24";
                 }
                 map.put("time", Integer.valueOf(hour));
-                if (forecastMap.get("result") != null) {
-                    values.add(forecastMap.get("result").toString().replace("\"", ""));
+                if (forecastMap.get("O3") != null) {
+                    values.add(forecastMap.get("O3").toString().replace("\"", ""));
                 } else {
                     values.add("");
                 }
@@ -308,32 +309,34 @@
         cal.add(Calendar.DAY_OF_MONTH, 1);
         Date end = cal.getTime();
         cal.setTime(sdf.parse(time));
+        Date time1 = cal.getTime();
         cal.add(Calendar.DAY_OF_MONTH, -1);
         String beforeDay = sdf.format(cal.getTime());
         parameters.put("start", selectTime);
         parameters.put("end", end);
-        Integer fcode=0;
+        Integer fcode = 0;
         List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecast(parameters);
         if (forecastList.size() == 0) {
             List<Area> areaList = areaMapper.getAreaByCityCode(code);
             for (Area area1 : areaList) {
                 if (area1 != null) {
                     parameters.put("cityCode", area1.getAreaCode());
-                    fcode=area1.getAreaCode();
+                    fcode = area1.getAreaCode();
                     forecastList = forecastWeatherMapper.getForecast(parameters);
                     if (forecastList.size() != 0) {
                         break;
                     }
                 }
             }
-        }else {
-            fcode= Integer.valueOf(parameters.get("cityCode").toString());
+        } else {
+            fcode = Integer.valueOf(parameters.get("cityCode").toString());
         }
 
         List<Map<String, Object>> foreList = new ArrayList<>();
         for (Map<String, Object> forecastMap : forecastList) {
             Map<String, Object> hashMap = new HashMap<>();
-            hashMap.put("time", forecastMap.get("time").toString());
+            String ftime = forecastMap.get("time").toString();
+            hashMap.put("time", ftime);
             hashMap.put("type", "������");
             hashMap.put("TVOC", "");
             hashMap.put("altitude", "");
@@ -343,11 +346,13 @@
             hashMap.put("SO2C", "");
             hashMap.put("NO2C", "");
             hashMap.put("COC", "");
-            hashMap.put("O3C", "");
+            if (forecastMap.get("O3C") == null) {
+                hashMap.put("O3C", "");
+            }
             hashMap.put("PM25C", "");
             hashMap.put("PM10C", "");
             hashMap.put("city", parameters.get("name").toString());
-            hashMap.put("code",fcode);
+            hashMap.put("code", fcode);
             if (sdf.parse(time).getTime() <= now.getTime()) {
                 hashMap.put("fxTime", (beforeDay + " 15:00").substring(5, 16));
             } else {
@@ -365,6 +370,7 @@
             foreList.add(hashMap);
         }
 
+        //������6���������������
         for (Map<String, Object> foreMap : foreList) {
             String ftime = foreMap.get("time").toString();
             Date endTime = sdf1.parse(ftime);
@@ -382,10 +388,27 @@
             }
         }
 
+        //������O3C_8H
+        for (Map<String, Object> map : foreList) {
+            Date endTime = sdf1.parse(map.get("time").toString());
+            cal.setTime(endTime);
+            cal.add(Calendar.HOUR, -8);
+            Date startTime = cal.getTime();
+            Map<String, Object> hashMap = new HashMap<>();
+            hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
+            hashMap.put("start", startTime);
+            hashMap.put("end", endTime);
+            Map<String, Object> O3Map = forecastWeatherMapper.getO38Hours(hashMap);
+            if (O3Map != null) {
+                Double O3C_8H = Double.valueOf(O3Map.get("O3C_8H").toString());
+                map.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
+            }
+        }
+
         String ac = parameters.get("cityCode").toString();
         List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
         if (aqiList.size() == 0) {
-            parameters.put("cityCode", code);//320500
+            parameters.put("cityCode", code);
             aqiList = hangzhouAqiMapper.getAqi(parameters);
             if (aqiList.size() == 0) {
                 List<Area> areaList = areaMapper.getAreaByCityCode(code);
@@ -405,12 +428,23 @@
             Map<String, Object> hashMap = new HashMap<>();
             hashMap.put("time", aqiMap.get("time"));
             Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(aqiMap.get("json").toString());
+            DecimalFormat df = new DecimalFormat(".####");
+            if (jsonMap.get("longitude") != null) {
+                double longitude = Double.valueOf(jsonMap.get("longitude").toString());
+                jsonMap.put("longitude", df.format(longitude));
+            }
+            if (jsonMap.get("latitude") != null) {
+                double longitude = Double.valueOf(jsonMap.get("latitude").toString());
+                jsonMap.put("latitude", df.format(longitude));
+            }
             hashMap.putAll(jsonMap);
             hashMap.put("city", parameters.get("name").toString());
             realAqilist.add(hashMap);
         }
+
         for (Map<String, Object> map : realAqilist) {
-            Date endTime = sdf1.parse(map.get("time").toString());
+            String rtime = map.get("time").toString();
+            Date endTime = sdf1.parse(rtime);
             cal.setTime(endTime);
             cal.add(Calendar.HOUR, -8);
             Date startTime = cal.getTime();
@@ -420,9 +454,16 @@
             hashMap.put("end", endTime);
             Map<String, Object> O3Map = hangzhouAqiMapper.getAvgO3EightHours(hashMap);
             map.put("O3C_8H", O3Map.get("O3C_8H").toString());
+            /*Double O3C_8H = Double.valueOf(O3Map.get("O3C_8H").toString());
+            map.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
+            Double PM25 = Double.valueOf(map.get("PM2_5").toString());
+            map.put("PM2_5", String.valueOf(Math.round(PM25)));
+            Double PM10 = Double.valueOf(map.get("PM10").toString());
+            map.put("PM10", String.valueOf(Math.round(PM10)));
+            Double O3 = Double.valueOf(map.get("O3").toString());
+            map.put("O3", String.valueOf(Math.round(O3)));*/
         }
         //������
-
         Map<String, Object> params = new HashMap<>();
         if (ac.endsWith("00")) {
             params.put("cityCode", Integer.valueOf(ac));
@@ -438,17 +479,34 @@
         }
         List<Device> deviceList = deviceMapper.getDeviceListByMonitorPointIds(pointList);
         List<String> macList = new ArrayList<>();
+        List<String> macList1 = new ArrayList<>();
         List<Map<String, Object>> beamList = new ArrayList<>();
+        List<Map<String, Object>> tvocList = new ArrayList<>();
         if (deviceList.size() != 0) {
             for (Device device : deviceList) {
-                String mac = device.getMac();
-                macList.add(mac);
+                macList.add(device.getMac());
             }
 
             parameters.put("macs", macList);
             beamList = historyHourlyMapper.getBeamByMacs(parameters);
+            Map<String, Object> map = new HashMap<>();
+            if (name.equals("���������")) {
+                List<Integer> list = new ArrayList<>();
+                list.add(48);
+                List<Device> pointIds = deviceMapper.getDeviceListByMonitorPointIds(list);
+                for (Device device : pointIds) {
+                    if (device.getId() != 1075) {
+                        macList1.add(device.getMac());
+                    }
+                }
+            } else {
+                macList1 = macList;
+            }
+            map.put("macs", macList1);
+            map.put("start", parameters.get("start"));
+            map.put("end", parameters.get("end"));
+            tvocList = historyHourlyMapper.getTVOCByMacs(map);
         }
-
         List<Map<String, Object>> realList = realWeatherMapper.getRealWeather(parameters);
         List<Map<String, Object>> realWeatherList = new ArrayList<>();
         for (Map<String, Object> realMap : realList) {
@@ -483,6 +541,14 @@
             if (precip6HourMap != null) {
                 realMap.put("precip6", precip6HourMap.get("precip6").toString());
             }
+
+            for (Map<String, Object> tvocMap : tvocList) {
+                String ttime = tvocMap.get("time").toString();
+                if (ttime.equals(rtime)) {
+                    realMap.put("TVOC", tvocMap.get("TVOC").toString());
+                }
+            }
+
         }
 
         List<Map<String, Object>> list = new ArrayList<>();
@@ -569,7 +635,7 @@
                 map.put("SO2C", map.get("SO2").toString());
             }
             if ((!map.containsKey("NO2C")) && map.containsKey("NO2")) {
-                map.put("NO2C", map.get("NO2C").toString());
+                map.put("NO2C", map.get("NO2").toString());
             }
             if ((!map.containsKey("O3C")) && map.containsKey("O3")) {
                 map.put("O3C", map.get("O3").toString());
@@ -583,11 +649,73 @@
             if ((!map.containsKey("PM10C")) && map.containsKey("PM10")) {
                 map.put("PM10C", map.get("PM10").toString());
             }
+            if (map.get("windScale") != null) {
+                String windScale = map.get("windScale").toString().replace("-", "~");
+                map.put("windScale", windScale);
+            }
+        }
 
+        //���4���������������
+        double value = 160.0 * 8;
+        int nowHour = Integer.valueOf(sdf1.format(now).substring(11, 13));
+        String format = sdf1.format(now).substring(0, 13) + ":00:00";
+        if (nowHour < 8) {
+            return resultList;
+        }
+        for (Map<String, Object> resultMap : resultList) {
+            if (resultMap.get("type").equals("������")) {
+                if (sdf.parse(time).getTime()==sdf.parse(sdf.format(now)).getTime()) {
+                    String rtime = resultMap.get("time").toString() + ":00";
+                    int rhour = Integer.valueOf(rtime.substring(11, 13));
+                    cal.setTime(sdf1.parse(rtime));
+                    cal.add(Calendar.HOUR_OF_DAY, -7);
+                    Date startTime = cal.getTime();
+                    Date endTime = sdf1.parse(format);
+                    Map<String, Object> hashMap = new HashMap<>();
+                    hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
+                    hashMap.put("start", startTime);
+                    hashMap.put("end", endTime);
+                    if (rhour == nowHour) {
+                        Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
+                        double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
+                        resultMap.put("goodValue", v);
+                    } else if (rhour == nowHour + 1) {
+                        Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
+                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2;
+                        resultMap.put("goodValue",String.valueOf(Math.round(v)));
+                    } else if (rhour == nowHour + 2) {
+                        Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
+                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3;
+                        resultMap.put("goodValue", String.valueOf(Math.round(v)));
+                    } else if (rhour == nowHour + 3) {
+                        Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
+                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString()) / 4);
+                        resultMap.put("goodValue", String.valueOf(Math.round(v)));
+                    }
+                }
+            }
+            if (resultMap.get("O3C_8H") != null && !resultMap.get("O3C_8H").equals("")) {
+                Double O3C_8H = Double.valueOf(resultMap.get("O3C_8H").toString());
+                resultMap.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
+            }
+
+            if (resultMap.get("PM25C") != null && !resultMap.get("PM25C").equals("")) {
+                Double PM25C = Double.valueOf(resultMap.get("PM25C").toString());
+                resultMap.put("PM25C", String.valueOf(Math.round(PM25C)));
+            }
+
+            if (resultMap.get("PM10C") != null && !resultMap.get("PM10C").equals("")) {
+                Double PM10C = Double.valueOf(resultMap.get("PM10C").toString());
+                resultMap.put("PM10C", String.valueOf(Math.round(PM10C)));
+            }
+
+            if (resultMap.get("O3C") != null && !resultMap.get("O3C").equals("")) {
+                Double O3C = Double.valueOf(resultMap.get("O3C").toString());
+                resultMap.put("O3C", String.valueOf(Math.round(O3C)));
+            }
         }
         return resultList;
     }
-
 
     @Override
     public void updateForecastWeather(Map<String, Object> parameters) {
@@ -613,10 +741,10 @@
                 String time = map.get("time").toString() + ":00";
                 Map<String, Object> hashMap = new HashMap<>();
                 hashMap.put("time", time);
-                hashMap.put("cityCode",Integer.valueOf(map.get("code").toString()));
+                hashMap.put("cityCode", Integer.valueOf(map.get("code").toString()));
                 Map<String, Object> jsonMap = new HashMap<>();
                 for (String key : map.keySet()) {
-                    if (!key.equals("city") && !key.equals("time") && !key.equals("type") && !key.equals("fxTime")&&!key.equals("code")) {
+                    if (!key.equals("city") && !key.equals("time") && !key.equals("type") && !key.equals("fxTime") && !key.equals("code")) {
                         String value = map.get(key).toString();
                         jsonMap.put(key, value);
                     }

--
Gitblit v1.8.0