xufenglei
2018-08-31 9437c74510c25be9d2413821c65fcf6ca4e6d21a
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");
@@ -727,4 +728,17 @@
      Map<String, Object> map = historyService.getActualDataByRegion(parameters);
      return new ResultBean<Map<String, Object>>(map);
   }
   @GetMapping("quality")
   @ApiOperation(value = "获取优良天数", notes = "获取优良天数")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "String")
   })
   public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {
      Map<String, Object> parameters = getParametersStartingWith(request, null);
      //Map<String, Object> map = hangzhouAqiService.getQualityCountDayByRegion(parameters);
      Map<String, Object> map = new HashMap<String, Object>();
      map.put("count", 136);
      return new ResultBean<Map<String, Object>>(map);
   }
}