xufenglei
2018-08-31 9437c74510c25be9d2413821c65fcf6ca4e6d21a
src/main/java/com/moral/controller/ScreenController.java
@@ -106,6 +106,10 @@
    private  OrganizationService organizationService;
   @Resource
    private  DictionaryDataService dictionaryDataService;
   @Resource
   private WeatherService weatherService;
   /**
    * Screen login. 大屏登录
    * 
@@ -126,7 +130,7 @@
         Object orgId = resultMap.get("orgId");
         if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {
                StringBuilder areaNamesBuilder = new StringBuilder("中国");
                if((Integer) orgId != dictionaryDataService.querySupperOrgId()) {
                if(!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
                    Organization organization = organizationService.getOrganizationById((Integer) orgId);
                    if(organization.getAreaNames()!=null){
                        AreaNames areaNames =  organization.getAreaNames();
@@ -547,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");
@@ -665,7 +670,7 @@
      return new ResultBean<List<Map<String, Object>>>(list);
   }
   @GetMapping("getmpoint-byid")
   @ApiOperation(value = "获取监测站数据", notes = "获取监测站数据,保证名称坐标等等")
   @ApiOperation(value = "获取监测站数据", notes = "获取监测站数据,包含名称、地址、坐标等详细信息")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "monitorPointId",defaultValue = "1",value = "监控站id", required = true, paramType = "query", dataType = "Integer"),
   })
@@ -673,4 +678,67 @@
      MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);
      return new ResultBean<>(monitorPoint);
   }
   @Resource
   HangzhouAqiService hangzhouAqiService;
   @GetMapping("aqi24hours")
   @ApiOperation(value = "最近24小时aqi数值", notes = "最近24小时国控aqi数值")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "组织id", required = true, paramType = "query", dataType = "Integer"),
   })
   public ResultBean<List<Map>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
      return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));
   }
   @GetMapping("mpt-dev-summary")
   @ApiOperation(value = "监控总数和设备状态信息", notes = "监控总数和设备状态信息")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "组织id", required = true, paramType = "query", dataType = "Integer"),
   })
   public ResultBean<Map> getMptAndDevSummary(@RequestParam("orgid") Integer organizationId){
        Map<String,Map> result = new HashMap<>(2);
          Integer mptCount = monitorPointService.countOfSubOrgs(organizationId);
          Map monitorPointSummary = new HashMap();
          monitorPointSummary.put("all",mptCount);
          Map deviceSummary = deviceService.queryDeviceStateSummary(organizationId);
        result.put("monitorPoint",monitorPointSummary);
        result.put("device",deviceSummary);
        return new ResultBean<>(result);
   }
   @GetMapping("weather")
   @ApiOperation(value = "获取区域天气情况", notes = "获取区域天气情况")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "String")
   })
   public ResultBean<Map<String, Object>> getWeatherDataByRegion(HttpServletRequest request) throws Exception {
      Map<String, Object> parameters = getParametersStartingWith(request, null);
      Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
      return new ResultBean<Map<String,Object>>(map);
   }
   @GetMapping("actual")
   @ApiOperation(value = "获取监测因子实时最大值", notes = "获取监测因子实时最大值")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "accountId",defaultValue = "1", value = "登录账号的id", required = true, paramType = "query", dataType = "String"),
         @ApiImplicitParam(name = "sensorKey",defaultValue = "e1,e2,e3", value = "传感器key,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"),
         @ApiImplicitParam(name = "time",defaultValue = "", value = "时间(long类型时间戳)", required = false, paramType = "query", dataType = "String"),
         @ApiImplicitParam(name = "interval",defaultValue = "30", value = "时间间隔(秒)", required = true, paramType = "query", dataType = "Integer"),
   })
   public ResultBean<Map<String, Object>> getActualDataByRegion(HttpServletRequest request) throws Exception {
      Map<String, Object> parameters = getParametersStartingWith(request, null);
      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);
   }
}