From 0a107debd7676141376a59bd3d4472912b24f7dc Mon Sep 17 00:00:00 2001 From: 于紫祥_1901 <email@yuzixiang_1910> Date: Thu, 13 Aug 2020 09:37:43 +0800 Subject: [PATCH] 风场图update --- src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 11 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..7687544 100644 --- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java +++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java @@ -13,6 +13,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; @@ -312,22 +313,22 @@ 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<>(); @@ -347,7 +348,7 @@ 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 { @@ -438,17 +439,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 +501,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 +595,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()); @@ -613,10 +639,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