From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Thu, 08 Aug 2019 17:03:55 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- src/main/java/com/moral/controller/ScreenController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 43d6ef5..662378a 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); @@ -973,6 +985,50 @@ List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id); return new ResultBean<List<Map<String, Object>>>(map); } + + @GetMapping("getSensorByDeviceId") + @ApiOperation(value = "������������������������", notes = "������������������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String") + }) + public ResultBean<List<Map<String, Object>>> getSensorByDeviceId(HttpServletRequest request) throws Exception { + Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); + String id = (String) parameters.get("id"); + List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id); + Map<String,Object> map = list.get(0); + String monitor_point_id = map.get("monitor_point_id").toString(); + List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id); + System.out.println(sensorUnitList); + for (Map<String, Object> sensorMap : list) { + for (Map<String, Object> sensorUnitMap : sensorUnitList) { + if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) { + sensorMap.put("unit", sensorUnitMap.get("name")); + } + } + } + return new ResultBean<List<Map<String, Object>>>(list); + } + + @GetMapping("getSensorWithUnitByMonitorPointId") + @ApiOperation(value = "������������������������", notes = "������������������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "monitor_point_id", value = "������id", required = true, paramType = "query", dataType = "String") + }) + public ResultBean<List<Map<String, Object>>> getSensorWithUnitByMonitorPointId(HttpServletRequest request) throws Exception { + Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); + String monitor_point_id = (String) parameters.get("monitor_point_id"); + List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id); + List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id); + System.out.println(sensorUnitList); + for (Map<String, Object> sensorMap : list) { + for (Map<String, Object> sensorUnitMap : sensorUnitList) { + if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) { + sensorMap.put("unit", sensorUnitMap.get("name")); + } + } + } + return new ResultBean<List<Map<String, Object>>>(list); + } @GetMapping("AIForecast") @ApiOperation(value = "AI������", notes = "AI������") -- Gitblit v1.8.0