From 1830f5429730a40f7d2f17ca748a80a4b1046c21 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 25 Mar 2019 09:12:22 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index e2cd8e5..32d638a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -872,11 +872,20 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "mac",defaultValue = "p5dnd7a0391956", value = "������mac���", required = true, paramType = "query", dataType = "String")
})
- public ResultBean<Map<String, Object>> getLimitDataByDevice(HttpServletRequest request) throws Exception {
+ public ResultBean<List<Map<String, Object>>> getLimitDataByDevice(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
String density = deviceService.getLimitDataByDevice(parameters);
JSONObject parseObject = JSONObject.parseObject(density);
- return new ResultBean<Map<String, Object>>(parseObject);
+ List<Map<String, Object>> resuList = new ArrayList<Map<String,Object>>();
+ for (Map.Entry entry : parseObject.entrySet()) {
+ resuList.add(new HashMap<String, Object>() {
+ {
+ put("key",entry.getKey());
+ put("limit", entry.getValue());
+ }
+ });
+ }
+ return new ResultBean<List<Map<String, Object>>>(resuList);
}
}
--
Gitblit v1.8.0