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/resources/mapper/DeviceMapper.xml | 3 +++
src/main/resources/mapper/MonitorPointMapper.xml | 4 ++++
src/main/webapp/view/map.jsp | 1 +
src/main/java/com/moral/controller/ScreenController.java | 8 ++++++--
4 files changed, 14 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);
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 92d256a..4b05ca1 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -238,6 +238,9 @@
AND dev.latitude < #{mapBounds.Fe,jdbcType=NUMERIC}
AND dev.latitude > #{mapBounds.Ke,jdbcType=NUMERIC}
]]>
+ <if test="regionCode != null">
+ AND mpt.${regionType}_code = #{regionCode}
+ </if>
AND dev.is_delete =0
</where>
</select>
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 8ece846..539f4f8 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -125,6 +125,10 @@
AND mpt.latitude < #{mapBounds.Fe,jdbcType=NUMERIC}
AND mpt.latitude > #{mapBounds.Ke,jdbcType=NUMERIC}
]]>
+ <if test="regionCode != null">
+ AND mpt.${regionType}_code = #{regionCode}
+ </if>
+
<if test="isDelete != null">
AND mpt.is_delete = #{isDelete,jdbcType=VARCHAR}
</if>
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 4625ff3..97427ad 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -357,6 +357,7 @@
var maxBounds = moralMap.getMaxBounds();
var paramMap = {};
paramMap["orgId"]= params['orgId'];
+ paramMap["regionCode"]= params['regionCode'];
// ���������������������
paramMap["Fe"]= maxBounds.northeastLat;//���������������������������
paramMap["Ge"]= maxBounds.northeastLng;//���������������������������
--
Gitblit v1.8.0