From 5f3e7e12b0d4d8d110ef85092a15fd133061e4e5 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Mon, 10 Aug 2020 17:36:48 +0800 Subject: [PATCH] 实测TVOC --- src/main/java/com/moral/controller/ScreenController.java | 198 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 179 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index f42bc29..566eb6d 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -9,16 +9,7 @@ import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -72,16 +63,14 @@ import com.moral.service.SensorService; import com.moral.service.SensorUnitService; import com.moral.service.WeatherService; -import com.moral.util.AQICalculation; -import com.moral.util.MyLatLng; -import com.moral.util.TempAllocationUtils; +import com.moral.util.*; -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; @@ -723,8 +712,8 @@ String time = map.get("time").toString(); time = time.substring(time.length() - 2); map.put("time", Integer.valueOf(time)); - if(parameters.get("type").equals("day")){ - map.put("time", Integer.valueOf(time)+1); + if (parameters.get("type").equals("day")) { + map.put("time", Integer.valueOf(time) + 1); } map.put("value", map.remove(sensorKey)); } @@ -1927,8 +1916,8 @@ if (minAngle > (Double) longAndLatiList.get(j).get("angle")) { minAngle = (Double) longAndLatiList.get(j).get("angle"); indexAngle = j; - }else { - indexAngle=indexAngle; + } else { + indexAngle = indexAngle; } } preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("h"))); @@ -1960,8 +1949,179 @@ locationList.add(fivethLoction); String preAngleDeviceString = JSON.toJSON(preAngleDeviceList).toString(); params.put("preAngleDeviceString", preAngleDeviceString);//��������������������������� - params.put("locationList",locationList); + params.put("locationList", locationList); return params; } + @GetMapping("forecastO3") + @ApiOperation(value = "���������������������������", notes = "���������������������������") + @ApiImplicitParams(value = { + @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); + 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); + List<Map<String, Object>> weatherList = weatherService.getWeatherData(parameters); + return new ResultBean<List<Map<String, Object>>>(weatherList); + } + + @PostMapping("updateForecastWeather") + public void updateForecastWeather(HttpServletRequest request){ + Map<String, Object> parameters = getParametersStartingWith(request, null); + weatherService.updateForecastWeather(parameters); + } + + @GetMapping("dataByTimeSlot") + @ApiOperation(value = "������������������������������������", notes = "������������������������������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "mac", value = "mac������", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "������������(���������2020-08-03/2020-08-03-13)", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "������������(���������2020-08-04/2020-08-04-14)", required = true, paramType = "query", dataType = "String")}) + public ResultBean<List<Map<String, Object>>> getDataByTimeSlot(HttpServletRequest request) throws Exception { + Map<String, Object> parameters = getParametersStartingWith(request, null); + String mac = parameters.get("mac").toString(); + String startTime = parameters.get("startTime").toString(); + String endTime = parameters.get("endTime").toString(); + //������������������������������ + Calendar calendar = Calendar.getInstance(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + List<Map<String, Object>> list = new ArrayList(); + Map device = deviceService.getAllFieldByMac(parameters); + Map monitorPointMap = monitorPointService.selectAllById(device.get("monitor_point_id").toString()); + List<Map<String, Object>> device_sensorList = sensorService.getSensorByDeviceId(device.get("id").toString()); + Map<String, Object> device_sensorUnit_map = new HashMap<>(); + for (Map<String, Object> device_sensorMap : device_sensorList) { + device_sensorUnit_map.put(device_sensorMap.get("sensor_key").toString(),device_sensorMap.get("unit")); + } + Map<String, String> sensorMap = sensorService.getSensorsMap(parameters); + if (startTime.length()==10&&endTime.length()==10){ + //������������������ + Date dd = new Date(); + //��������� + SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd"); + //������������������������ + String nowTime = sim.format(dd); + int days = endTime.compareTo(nowTime); + //System.out.println(days); + List<String> dayList = DatesUtil.findDaysStr(startTime,endTime); + //System.out.println("dayList:"+dayList); + /*if (days<0){ + Date date=null; + try { + date = new SimpleDateFormat("yy-MM-dd").parse(endTime); + } catch (ParseException e) { + e.printStackTrace(); + } + calendar.setTime(date); + int day=calendar.get(Calendar.DATE); + calendar.set(Calendar.DATE,day+1); + + endTime=new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime()); + }*/ + List<Map<String, Object>> sameDayHourlyList = null; + if (days>=0){ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //������������������������ + String currentTime = df.format(dd); + sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac,nowTime,currentTime); + } + List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac,startTime,endTime); + if (dataList.isEmpty()){ + return null; + } + Set<String> keys = sensorMap.keySet(); + for (String key:keys) { + Map<String,Object> oneSensorMap = new LinkedHashMap<>(); + oneSensorMap.put("monitorPointName",monitorPointMap.get("name")); + oneSensorMap.put("deviceName",device.get("name")); + oneSensorMap.put("sersorKey",sensorMap.get(key)+"���"+device_sensorUnit_map.get(key)+"���"); + for (String day:dayList) { + for (Map<String, Object> dataMap: dataList) { + JSONObject dataJson = JSONObject.parseObject(dataMap.get("json").toString()); + if (dataMap.get("time").toString().equals(day+" 00:00:00.0")){ + oneSensorMap.put(dataMap.get("time").toString().substring(0,10),dataJson.getJSONArray(key).get(2)); + break; + }else { + continue; + } + } + if(!oneSensorMap.containsKey(day)){ + oneSensorMap.put(day,""); + } + } + + Double avg = 0.0; + if (sameDayHourlyList != null){ + for (Map sameDayHourlyMap:sameDayHourlyList){ + List<Double> arr = new ArrayList<>(); + JSONObject hourlyJson = JSONObject.parseObject(sameDayHourlyMap.get("json").toString()); + arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(2).toString())); + Double sum = 0.0; + for (int i=0;i<arr.size();i++){ + sum += arr.get(i); + } + avg = sum / arr.size(); + } + oneSensorMap.put(nowTime,avg); + } + list.add(oneSensorMap); + } + }else if (startTime.length()==13&&endTime.length()==13){ + StringBuilder startTime_sb = new StringBuilder(startTime); + startTime_sb.replace(10,11," "); + startTime = startTime_sb.toString()+":00:00"; + StringBuilder endTime_sb = new StringBuilder(endTime); + endTime_sb.replace(10,11," "); + endTime = endTime_sb.toString()+":00:00"; + + List<String> hoursList = DatesUtil.findHoursStr(startTime,endTime); + //System.out.println("hoursList:"+hoursList); + + List<Map<String, Object>> hourlyList = historyHourlyService.getDataByTimeSlot(mac,startTime,endTime); + if (hourlyList.isEmpty()){ + return null; + } + Set<String> keys = sensorMap.keySet(); + for (String key:keys) { + Map<String,Object> oneSensorMap = new LinkedHashMap<>(); + oneSensorMap.put("monitorPointName",monitorPointMap.get("name")); + oneSensorMap.put("deviceName",device.get("name")); + oneSensorMap.put("sersorKey",sensorMap.get(key)+"���"+device_sensorUnit_map.get(key)+"���"); + for (String hour:hoursList) { + for (Map<String, Object> hourlyMap: hourlyList) { + JSONObject dataJson = JSONObject.parseObject(hourlyMap.get("json").toString()); + if (hourlyMap.get("time").toString().equals(hour+".0")){ + oneSensorMap.put(hourlyMap.get("time").toString().substring(0,19),dataJson.getJSONArray(key).get(2)); + break; + }else { + continue; + } + } + if(!oneSensorMap.containsKey(hour)){ + oneSensorMap.put(hour,""); + } + } + /*for (Map<String, Object> hourlyMap: hourlyList) { + JSONObject hourlyJson = JSONObject.parseObject(hourlyMap.get("json").toString()); + oneSensorMap.put(hourlyMap.get("time").toString().substring(0,19),hourlyJson.getJSONArray(key).get(2)); + + }*/ + list.add(oneSensorMap); + } + }else { + return null; + } + return new ResultBean<List<Map<String, Object>>>(list); + } + } -- Gitblit v1.8.0