From 6f5dc4ff458a78ec4ff341ca33b5bd5e99fbc8e5 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 13 Jul 2018 14:38:18 +0800
Subject: [PATCH] demo
---
src/main/java/com/moral/controller/ScreenController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 11ada56..759c759 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -53,7 +53,7 @@
@RequestMapping("/screen")
@CrossOrigin(origins = "*", maxAge = 3600)
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
-@Api(tags = "Screen", description = "������������")
+@Api(tags = "Screen", description = "������������")
public class ScreenController {
public static Logger log = Logger.getLogger(ScreenController.class);
@Resource
@@ -619,7 +619,12 @@
})
public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(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[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
parameters.put("sensors", Arrays.asList(sensorKeys));
--
Gitblit v1.8.0