From 5c6a71fbcad27a637c775358d1004ddb95f55729 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 17:29:41 +0800
Subject: [PATCH] 地图相关资源 设置不拦截

---
 src/main/resources/mapper/MonitorPointMapper.xml |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index bf0a5ee..ee6e6af 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -13,6 +13,7 @@
     <result column="address" jdbcType="VARCHAR" property="address" />
     <result column="is_delete" jdbcType="CHAR" property="isDelete" />
     <result column="description" jdbcType="VARCHAR" property="description" />
+	  <result column="state" jdbcType="INTEGER" property="state" />
 	<!-- ������������������������������ -->
     <association property="areaNames" javaType="com.moral.entity.AreaNames">
 	  <result column="province_name" property="provinceName" jdbcType="VARCHAR" />
@@ -20,7 +21,7 @@
 	  <result column="area_name" property="areaName" jdbcType="VARCHAR" />
     </association>
 	  <association property="organization" javaType="com.moral.entity.Organization">
-		  <result column="organization_id" property="id" jdbcType="VARCHAR" />
+		  <result column="organization_id" property="id" jdbcType="INTEGER" />
 		  <result column="organization_name" property="name" jdbcType="VARCHAR" />
 	  </association>
   </resultMap>
@@ -100,4 +101,18 @@
 			AND mp.city_code = c.city_code
 		</if>
 	</select>
+	<select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
+		SELECT mpt.* from monitor_point mpt
+		<where>
+			<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
+				mpt.organization_id = #{orgId,jdbcType=VARCHAR}
+			</if>
+			<![CDATA[
+			AND mpt.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
+            AND mpt.longitude > #{mapBounds.Le,jdbcType=NUMERIC}
+            AND mpt.latitude  < #{mapBounds.Fe,jdbcType=NUMERIC}
+            AND mpt.latitude  > #{mapBounds.Ke,jdbcType=NUMERIC}
+     		 ]]>
+		</where>
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0