Merge remote-tracking branch 'origin/master'

沈斌

2017-10-27 a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424

 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;

   }

}