Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-29 1097d9b75533cd4686bc24cb06ed98010fcfcecf

 src/main/java/com/moral/controller/ScreenController.java

@@ -551,7 +551,8 @@
   @GetMapping("report_alarm_datas")

   public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      parameters.put("type", "month");

      ParameterUtils.getTimeType4Time(parameters);

      //parameters.put("type", "month");

      String sensorKey = "list";

      if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {

         parameters.put("description", "description");