From 41863d2c44c03dca9f0bff4e3fad2be454362da0 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 24 Aug 2018 16:20:59 +0800
Subject: [PATCH] 霸屏页面 接口
---
src/main/java/com/moral/controller/ScreenController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 85ca2b6..48888a9 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/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);
+ }
}
--
Gitblit v1.8.0