From b4aa377b5e7898cd2ef018cc385a19af67a56839 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 26 Mar 2018 14:05:58 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/resources/mapper/MonitorPointMapper.xml | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 652012a..5e6b2a4 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" />
@@ -100,10 +101,8 @@
AND mp.city_code = c.city_code
</if>
</select>
- <select id="selectWithStateByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
-
- SELECT mpt.*,MAX(dev.state) as state from monitor_point mpt
- LEFT JOIN device dev on dev.monitor_point_id = mpt.id
+ <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}
@@ -113,25 +112,10 @@
AND mpt.longitude > #{mapBounds.Le,jdbcType=NUMERIC}
AND mpt.latitude < #{mapBounds.Fe,jdbcType=NUMERIC}
AND mpt.latitude > #{mapBounds.Ke,jdbcType=NUMERIC}
- and state<4
- GROUP BY mpt.`id`
]]>
</where>
- UNION
- SELECT mpt.*,MAX(dev.state) as state from monitor_point mpt
- LEFT JOIN device dev on dev.monitor_point_id = mpt.id
- <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}
- and state>3
- GROUP BY mpt.`id`
- ]]>
- </where>
+ </select>
+ <select id="selectOrganizationIds" parameterType="integer" resultType="integer">
+ call proc_organizationIds_GetByMonitorPointId(#{id,jdbcType=NUMERIC})
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0