From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/mapper/MonitorPointMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 8ece846..2743e54 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -88,7 +88,7 @@
</if>
)
</select>
- <select id="getMonitorPointsByAreaName" resultType="com.moral.entity.MonitorPoint">
+ <select id="getMonitorPointsByAreaName" resultMap="BaseResultMap">
SELECT
mp.*
FROM
@@ -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>
@@ -139,4 +143,9 @@
right join monitor_point mpt on mpt.id = dev.monitor_point_id
where mpt.id = #{id} ORDER BY version DESC
</select>
+ <select id="selectAllById" resultType="java.util.Map">
+ SELECT *
+ FROM monitor_point
+ WHERE id = #{id}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0