From 00dabe413d23e8bc03e2f5cf884a4f25f1c9bc49 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Fri, 20 Jul 2018 16:19:08 +0800 Subject: [PATCH] 增加 按日期 查询 --- src/main/java/com/moral/controller/ScreenController.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 85745f8..ba2a89e 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -528,7 +528,12 @@ @GetMapping("report_avg_datas") public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception { Map<String, Object> parameters = getParametersStartingWith(request, null); - parameters.put("type", "month"); + int length = ((String)parameters.get("time")).split("-").length; + if (length == 2) { + parameters.put("type", "month"); + } else if (length == 3){ + parameters.put("type", "day"); + } parameters.put("monitorPointId", parameters.remove("monitorPoint")); String sensorKey = parameters.remove("sensorKey").toString(); List<String> sensorKeys = new ArrayList<String>(); -- Gitblit v1.8.0