From a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 10:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/controller/ScreenController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ScreenController.java b/src/main/java/com/moral/monitor/controller/ScreenController.java
index 6a5b52b..1461e55 100644
--- a/src/main/java/com/moral/monitor/controller/ScreenController.java
+++ b/src/main/java/com/moral/monitor/controller/ScreenController.java
@@ -66,17 +66,24 @@
return resultMap;
}
- @RequestMapping(value = "/month-average", method = RequestMethod.GET)
- public Map<String, Object> getDataByEquipmentMac(HttpServletRequest request) {
+ @RequestMapping(value = "/month", method = RequestMethod.GET)
+ public Map<String, Object> getMonthDataByEquipment(HttpServletRequest request) {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
- Map<String, Object> resu = screenService.getDataByEquipmentMac(parameters);
- return resu;
+ Map<String, Object> result = screenService.getMonthDataByEquipment(parameters);
+ return result;
}
@RequestMapping(value = "/all-average", method = RequestMethod.GET)
public Map<String, Object> getAverageByAll(HttpServletRequest request) {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
- Map<String, Object> resu = screenService.getAverageByAll(parameters);
- return resu;
+ Map<String, Object> result = screenService.getAverageByAll(parameters);
+ return result;
+ }
+
+ @RequestMapping(value = "/equipment-state", method = RequestMethod.GET)
+ public Map<String, Object> getEquipmentStates(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Map<String, Object> result = screenService.getEquipmentStates(parameters);
+ return result;
}
}
--
Gitblit v1.8.0