From 3c7db3d43212a01302c3b375f94a332e1f28d511 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 22 Oct 2020 10:10:07 +0800
Subject: [PATCH] 增加国控站坐标获取
---
src/main/java/com/moral/controller/ScreenController.java | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index c55bbdf..1589d0b 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -2516,30 +2516,17 @@
return screenVersionService.getScreenVersion(version);
}
- @GetMapping("devices-sensors-excel")
+ @GetMapping("allDeviceExcel")
@ApiOperation(value = "���������������������������������", notes = "���������������������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPoint", value = "������������id", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "sensorKey", value = "���������key,������������������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "������(���������2020-04-09)", required = true, paramType = "query", dataType = "String")})
- public ResultBean<List<Map<String, Object>>> getDevicesToExcel(HttpServletRequest request) throws Exception {
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2020-08-03)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2020-08-04)", required = false, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> getAllDeviceDataToExcel(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
ParameterUtils.getTimeType4Time(parameters);
- /*String[] sensorKeys = parameters.get("sensorKey").toString().split(",");
- parameters.put("sensorKeys", Arrays.asList(sensorKeys));
- 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 = new ArrayList<>();
- if (!CollectionUtils.isEmpty(macList)) {
- list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);
- }*/
- List<Map<String, Object>> list = historyMinutelyService.getDevicesSensorsToExcel(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getAllDeviceDataToExcel(parameters);
return new ResultBean<List<Map<String, Object>>>(list);
}
}
\ No newline at end of file
--
Gitblit v1.8.0