From c3a445185ee6e016718402ab3e807450b498c901 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 12 Dec 2018 10:43:45 +0800
Subject: [PATCH] 查看 所选区域 信息
---
src/main/java/com/moral/controller/ScreenController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 7d68481..24a34eb 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -468,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);
@@ -480,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);
--
Gitblit v1.8.0