From 1a5dddf9f8ca09da14f6abdeb0f125baffd9fc87 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:08 +0800
Subject: [PATCH] 修改弹窗信息内容
---
src/main/java/com/moral/controller/ScreenController.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5f1f7eb..3e7e744 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;
@@ -361,6 +365,16 @@
public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
return historyMinutelyService.getDayAQIByDevice(parameters);
+ }
+
+ @GetMapping("hour-aqi")
+ @ApiOperation(value = "���������������AQI", notes = "���������������AQI")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������", required = true, paramType = "query", dataType = "String")
+ })
+ public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return historyService.gitHourlyAQIByMacAndTimeslot(parameters);
}
/**
@@ -1156,21 +1170,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 = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17 17:07:00)", required = false, 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);
@@ -1180,4 +1216,41 @@
}
}
+ @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;
+ }
+
}
--
Gitblit v1.8.0