update

xufenglei

2019-03-25 1830f5429730a40f7d2f17ca748a80a4b1046c21

 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);

   }



}