From e8ef361dc975aeaedeee6f28dfe679489a22f9d5 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 02 Sep 2019 17:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/mapper/AlarmConfigMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/AlarmConfigMapper.xml b/src/main/resources/mapper/AlarmConfigMapper.xml
index 9d0bbd4..f8c95ff 100644
--- a/src/main/resources/mapper/AlarmConfigMapper.xml
+++ b/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -12,7 +12,7 @@
id, organization_id, value, create_time, update_time
</sql>
<select id="selectByOrganizationId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
+ select
<include refid="Base_Column_List" />
from alarm_config
where organization_id = #{organizationId,jdbcType=INTEGER}
@@ -97,4 +97,21 @@
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
</update>
+ <select id="selectByMonitorPointId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+ select
+ acg.*
+ from alarm_config acg
+ LEFT JOIN monitor_point mpt on acg.organization_id = mpt.organization_id
+ where mpt.id = #{mpId,jdbcType=INTEGER}
+ limit 0,1
+ </select>
+ <select id="selectByDeviceMac" parameterType="java.lang.String" resultMap="BaseResultMap">
+ select
+ acg.*
+ from alarm_config acg
+ LEFT JOIN monitor_point mpt on acg.organization_id = mpt.organization_id
+ LEFT JOIN device dev on mpt.id = dev.monitor_point_id
+ where dev.mac = #{mac,jdbcType=VARCHAR}
+ limit 0,1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0