fengxiang
2018-08-24 41863d2c44c03dca9f0bff4e3fad2be454362da0
src/main/java/com/moral/controller/ScreenController.java
@@ -126,7 +126,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();
@@ -673,4 +673,29 @@
      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);
   }
}