From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001 From: JinPengYong <812110275@qq.com> Date: Sun, 26 Apr 2020 16:18:30 +0800 Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts. --- src/main/java/com/moral/controller/ScreenController.java | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 5137bf5..e4bb92c 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -18,8 +18,10 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Set; import java.util.stream.Collectors; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; @@ -100,9 +102,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import static com.moral.common.util.ResourceUtil.getValue; import static com.moral.common.util.WebUtils.getParametersStartingWith; @@ -1069,7 +1068,6 @@ 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"))) { @@ -1090,8 +1088,6 @@ 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("list:" + list); - System.out.println("sensorUnitList:" + sensorUnitList); for (Map<String, Object> sensorMap : list) { for (Map<String, Object> sensorUnitMap : sensorUnitList) { if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) { @@ -1306,9 +1302,7 @@ 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("MonitorPointAQI", hourAqi.get("AQI")); returnMap.put("StateControlAQI", StateControl.get("AQI")); @@ -1388,17 +1382,26 @@ @ApiOperation(value = "������������������������", notes = "������������������������") @ApiImplicitParams(value = { @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "organizationId", value = "���������������������id(���99)", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"), + @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String"), @ApiImplicitParam(name = "time", value = "������(���������2020-04-09���2019-04)", required = true, paramType = "query", dataType = "String")}) public ResultBean<List<Map<String, Object>>> getDevicesDataToExcel(HttpServletRequest request) throws Exception { Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); ParameterUtils.getTimeType4Time(parameters); - parameters.put("sensorKeys", Arrays.asList(parameters.get("sensorKey"))); - Object organizationId = parameters.get("organizationId"); - Set<Integer> organizationIds = organizationService.getChildOrganizationIds(Integer.valueOf(organizationId.toString())); - List<String> macList = deviceService.getMacsByOrganizationId(new ArrayList<>(organizationIds)); + Object sensorKey = parameters.get("sensorKey"); + parameters.put("sensorKeys", Arrays.asList(sensorKey)); + List<String> macList = new ArrayList<>(); + List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters); + for (MonitorPoint m : monitorPoints) { + for (Device d : m.getDevices()) { + macList.add(d.getMac()); + } + } parameters.put("macs", macList); - List<Map<String, Object>> list = historyMinutelyService.getDevicesAvgDataToExcel(parameters); + List<Map<String, Object>> list = new ArrayList<>(); + if (!CollectionUtils.isEmpty(macList)) { + list = historyMinutelyService.getDevicesAvgDataToExcel(parameters); + } return new ResultBean<List<Map<String, Object>>>(list); } -- Gitblit v1.8.0