From 1bd6a5e7678477f5b1fab449c6d618aae9041611 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 13 Feb 2019 11:13:19 +0800
Subject: [PATCH] 设备 相关更新

---
 src/main/java/com/moral/controller/ScreenController.java |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index b3a2be2..24a34eb 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -39,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;
 
@@ -149,7 +150,7 @@
 							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");
@@ -166,7 +167,7 @@
 					}else if(organization.getProvinceCode()!=null) {
 						mapAreaCode  = organization.getProvinceCode();
 					}
-					resultMap.put("mapAreaCode ",mapAreaCode.toString() );
+					resultMap.put("mapAreaCode",mapAreaCode.toString() );
                 }
                 resultMap.put("mapPath",areaNamesBuilder.toString());
             }
@@ -467,11 +468,13 @@
 	}
 	@RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET)
 	@ResponseBody
-	public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds){
+	public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){
 		ResultBean<List<MonitorPoint>> resultBean = new ResultBean();
 		Map<String,Object> paramMap = new HashMap<String, Object>();
 		paramMap.put("orgId", orgId);
 		paramMap.put("mapBounds",mapBounds);
+		paramMap.put("regionCode",regionCode);
+		ParameterUtils.getRegionType4RegionCode(paramMap);
 		List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
 		resultBean.setData(list);
 		resultBean.setCode(ResultBean.SUCCESS);
@@ -479,11 +482,13 @@
 	}
 	@RequestMapping(value="/get-devices",method = RequestMethod.GET)
 	@ResponseBody
-	public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds){
+	public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){
 		ResultBean<List<Device>> resultBean = new ResultBean();
 		Map<String,Object> paramMap = new HashMap<String, Object>();
 		paramMap.put("orgId", orgId);
 		paramMap.put("mapBounds",mapBounds);
+		paramMap.put("regionCode",regionCode);
+		ParameterUtils.getRegionType4RegionCode(paramMap);
 		List<Device> list = deviceService.query(paramMap);
 		resultBean.setData(list);
 		resultBean.setCode(ResultBean.SUCCESS);
@@ -705,7 +710,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")
@@ -759,4 +764,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