From 3649b739991d079ee1669f02c60b3ee01c2877e1 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Mon, 02 Sep 2019 17:14:51 +0800 Subject: [PATCH] 空气质量对比 --- src/main/java/com/moral/controller/ScreenController.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 112 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 1797eaa..7fd470e 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -8,6 +8,10 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.text.DecimalFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.Month; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -90,6 +94,7 @@ import com.moral.service.SensorService; import com.moral.service.SensorUnitService; import com.moral.service.WeatherService; +import com.moral.util.AQICalculation; import com.moral.util.TempAllocationUtils; import io.swagger.annotations.Api; @@ -1166,21 +1171,43 @@ @ApiOperation(value = "���������������������������", notes = "���������������������������") @ApiImplicitParams(value = { @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17 17:07:00)", required = true, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17 17:07:00)", required = true, paramType = "query", dataType = "String") + @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String") }) public ModelAndView uavTrajectory(ModelAndView model, HttpServletRequest request) throws Exception { Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); + String st = parameters.get("startTime").toString(); + String startYearAndDay = st.substring(0, st.lastIndexOf("-")); + String startHour = st.substring(st.lastIndexOf("-") + 1); + String startTime = startYearAndDay + " " + startHour + ":00:00"; + String et = parameters.get("endTime").toString(); + String endYearAndDay = et.substring(0, et.lastIndexOf("-")); + String endHour = et.substring(et.lastIndexOf("-") + 1); + String endTime = endYearAndDay + " " + endHour + ":00:00"; + parameters.put("startTime", startTime); + parameters.put("endTime", endTime); String mac = parameters.get("mac").toString(); if (mac != null && mac.length() != 0) { - List<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters); + List<List<Map<String, Object>>> sensorData = historyMinutelyService.getSensorData(parameters); + Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters); + List<Map<String, Object>> sensorList = new ArrayList<>(); + List<Map<String, Object>> sensorListMin = new ArrayList<>(); + List<Map<String, Object>> sensorListMax = new ArrayList<>(); + if (sensorData.size() == 3) { + sensorList = sensorData.get(0); + sensorListMin = sensorData.get(1); + sensorListMax = sensorData.get(2); + } JSONObject params = new JSONObject(); params.put("sensorInfo", sensorList); + params.put("sensorInfoMin", sensorListMin); + params.put("sensorInfoMax", sensorListMax); + params.put("sensorsMap",sensorsMap); String paramsJson = params.toJSONString(); model.addObject("uavTrajectoryParams", paramsJson); - model.setViewName("uavTrajectory"); + model.setViewName("uavtrajectory"); return model; - }else { + } else { StringBuilder msg = new StringBuilder(); msg.append(" param[0] mac:"); msg.append(mac); @@ -1190,4 +1217,84 @@ } } + @GetMapping("/pollutionSource") + @ApiOperation(value = "������������������", notes = "������������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "mac", value = "������mac������(������p5dnd7a0391972)", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "time", value = "������������(���������2019-08-22)", required = true, paramType = "query", dataType = "String")}) + public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception { + Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); + LocalDate today = LocalDate.now(); + String time = parameters.get("time").toString(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate selectTime = LocalDate.parse(time, dateTimeFormatter); + int month = selectTime.getMonth().getValue(); + LocalDate yesterday = today.minusDays(1); + LocalDate futureDay = today.plusDays(14); + Boolean isAfterYesterday = selectTime.isAfter(yesterday) || selectTime.isEqual(yesterday); + Boolean isAfterFutureDay = selectTime.isAfter(futureDay); + Map<String, Object> weatherInfoToday = weatherService.getWeatherDataByRegion(parameters); + Map<String, Object> weatherInfoForecast = new HashMap<>(); + if (isAfterYesterday && !isAfterFutureDay) { + weatherInfoForecast = weatherService.get15DayWeatherDataByRegion(parameters); + } + Boolean isToday = selectTime.isEqual(today); + String mac = parameters.get("mac").toString(); + Device device = deviceService.getDeviceByMac(mac, false); + JSONObject params = new JSONObject(); + params.put("weatherInfoToday", weatherInfoToday); + params.put("weatherInfoForecast", weatherInfoForecast); + params.put("device", device); + params.put("isToday", isToday); + params.put("month", month); + String paramsJson = params.toJSONString(); + model.addObject("pollutionSourceParams", paramsJson); + model.setViewName("pollutionsource"); + return model; + } + + @GetMapping("getAirQualityComparison") + @ApiOperation(value = "������������������", notes = "������������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "������������id", required = true, paramType = "query", dataType = "String")}) + public ResultBean<Map<String, Object>> getAirQualityComparison(HttpServletRequest request) throws Exception { + Map<String, Object> parameters = getParametersStartingWith(request, null); + Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters); + Map<String, Double> sensorMap = new HashMap<>(); + sensorMap.put("e1", Double.parseDouble(map.get("pm25").toString())); + sensorMap.put("e2", Double.parseDouble(map.get("pm10").toString())); + sensorMap.put("e11", Double.parseDouble(map.get("so2").toString())); + sensorMap.put("e16", Double.parseDouble(map.get("no2").toString())); + sensorMap.put("e10", Double.parseDouble(map.get("co").toString())); + sensorMap.put("e15", Double.parseDouble(map.get("o3").toString())); + Map<String, Object> StateControl = AQICalculation.hourlyAQI(sensorMap); + System.out.println("StateControl:"+StateControl); + Map<String, Object> hourAqi = historyService.gitHourlyAQIByMonitorPointIdAndTimeslot(parameters); + System.out.println("hourAqi:"+hourAqi); + Map<String, Object> returnMap = new HashMap<>(); + returnMap.put("������AQI", hourAqi.get("AQI")); + returnMap.put("������AQI", StateControl.get("AQI")); + return new ResultBean<Map<String, Object>>(returnMap); + } + + + @GetMapping("mointorPointRank") + @ApiOperation(value = "������������������", notes = "������������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String") + }) + public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request){ + Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); + String id = parameters.get("accountId").toString(); + String sensor = parameters.get("sensor").toString(); + Map<String, Object> account = accountService.getOrganizationIdByAccountId(id); + //������������id������������������������������ + account.put("sensor", sensor); + List<Map<String, Object>> returnList = historyService.getMointorPointRankByOrganizationId(account); + return new ResultBean<List<Map<String, Object>>>(returnList); + } + } -- Gitblit v1.8.0