From 691311e750b9d9d28b38862977e347e938155f47 Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Fri, 16 Aug 2019 09:40:22 +0800 Subject: [PATCH] 最大值和最小值按钮美化并加效果 --- src/main/java/com/moral/controller/ScreenController.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index f932cb4..03e24df 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -365,9 +365,12 @@ @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 historyMinutelyService.getHourAQIByDevice(parameters); + return historyService.gitHourlyAQIByMacAndTimeslot(parameters); } /** @@ -858,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); @@ -1161,21 +1166,25 @@ @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:07:00)", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17 17:07:00)", required = true, paramType = "query", dataType = "String") }) public ModelAndView uavTrajectory(ModelAndView model, HttpServletRequest request) throws Exception { Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); String mac = parameters.get("mac").toString(); if (mac != null && mac.length() != 0) { List<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters); + List<Map<String, Object>> sensorListMin = historyMinutelyService.getSensorDataMin(parameters); + List<Map<String, Object>> sensorListMax = historyMinutelyService.getSensorDataMax(parameters); 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