From b2ea3adf3787f53487ad10faa116df0d586de652 Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Mon, 19 Aug 2019 20:11:51 +0800
Subject: [PATCH] 修改无人机平均值，最小值和最大值直接从list集合中取
---
src/main/java/com/moral/controller/ScreenController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 0b1580d..06124cb 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -362,6 +362,16 @@
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);
+ }
/**
* Gets the average by all. ������������������������10������������5������������������������������������������
@@ -851,7 +861,9 @@
@ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "time", defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String")})
+ @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPointId", value = "���������id", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String")})
public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
@@ -1154,21 +1166,35 @@
@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<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters).get(0);
+ List<Map<String, Object>> sensorListMin = historyMinutelyService.getSensorData(parameters).get(1);
+ List<Map<String, Object>> sensorListMax = historyMinutelyService.getSensorData(parameters).get(2);
JSONObject params = new JSONObject();
params.put("sensorInfo", sensorList);
+ params.put("sensorInfoMin", sensorListMin);
+ params.put("sensorInfoMax", sensorListMax);
String paramsJson = params.toJSONString();
model.addObject("uavTrajectoryParams", paramsJson);
model.setViewName("uavTrajectory");
return model;
- }else {
+ } else {
StringBuilder msg = new StringBuilder();
msg.append(" param[0] mac:");
msg.append(mac);
--
Gitblit v1.8.0