From 722e827a94213a478e0a4b62d3b590fc78d25737 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 06 Dec 2018 10:57:52 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 27c491d..7d68481 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -20,6 +20,7 @@
import com.moral.entity.layout.RealTimeDeviceLayout;
import com.moral.service.*;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.log4j.Logger;
import org.dom4j.Document;
@@ -38,6 +39,7 @@
import com.moral.common.bean.PageResult;
import com.moral.common.bean.ResultBean;
import com.moral.common.util.ValidateUtil;
+import com.moral.common.util.WebUtils;
import com.moral.common.xml.Version;
import com.moral.entity.alarm.AlarmSensorLevel;
@@ -148,24 +150,24 @@
areaNamesBuilder.append(String.join("/",names));
}
// ������������
- if( 0 == organization.getRank()) {
+ if(organization.getRank()!=null && organization.getRank() == 0) {
resultMap.put("type","enterprise");
}else{
resultMap.put("type","government");
}
- Number areaCode = null;
+ Number mapAreaCode = null;
if(organization.getVillageCode()!=null){
- areaCode = organization.getVillageCode();
+ mapAreaCode = organization.getVillageCode();
}else if (organization.getTownCode()!=null){
- areaCode = organization.getTownCode();
+ mapAreaCode = organization.getTownCode();
}else if(organization.getAreaCode()!=null) {
- areaCode = organization.getAreaCode();
+ mapAreaCode = organization.getAreaCode();
}else if(organization.getCityCode()!=null) {
- areaCode = organization.getCityCode();
+ mapAreaCode = organization.getCityCode();
}else if(organization.getProvinceCode()!=null) {
- areaCode = organization.getProvinceCode();
+ mapAreaCode = organization.getProvinceCode();
}
- resultMap.put("areaCode",areaCode);
+ resultMap.put("mapAreaCode",mapAreaCode.toString() );
}
resultMap.put("mapPath",areaNamesBuilder.toString());
}
@@ -704,7 +706,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "orgid",defaultValue = "5",value = "������id", required = true, paramType = "query", dataType = "Integer"),
})
- public ResultBean<List<Map>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
+ public ResultBean<List<Map<String,Object>>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));
}
@GetMapping("mpt-dev-summary")
@@ -758,4 +760,29 @@
Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
return new ResultBean<Map<String, Object>>(map);
}
+
+ @GetMapping("monitorpoints-devices")
+ @ApiOperation(value = "���������������������������", notes = "���������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId",defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "regionCode",defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ List<MonitorPoint> monitorPoints= monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+ return new ResultBean<List<MonitorPoint>>(monitorPoints);
+ }
+
+
+ @GetMapping("devices-state")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId",defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "regionCode",defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<Collection<Object>> getDevicesStateByRegion(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Collection<Object> monitorPoints= monitorPointService.getDevicesStateByRegion(parameters);
+ return new ResultBean<Collection<Object>>(monitorPoints);
+ }
}
--
Gitblit v1.8.0