From 8110506221e3c34a62202e34b7dd28227c13c714 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 15 Apr 2020 15:43:29 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5137bf5..e5518cc 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1388,17 +1388,29 @@
@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);
+ }
+ for (Map<String, Object> map : list) {
+ map.put("value", map.remove(sensorKey));
+ }
return new ResultBean<List<Map<String, Object>>>(list);
}
--
Gitblit v1.8.0