From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/MonitorPointMapper.xml | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index b6a90f0..30bfe68 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -189,9 +189,8 @@
resultMap="BaseResultMap">
select * from monitor_point where province_code=#{provinceCode} limit 0,1
</select>
-
- <select id="getMonitorList" resultMap="BaseResultMap">
- select * from monitor_point
+ <select id="getMonitorPointIds" resultType="java.lang.Integer">
+ select id from monitor_point
where
<if test="areaCode != null">
area_code = #{areaCode}
@@ -200,5 +199,45 @@
<if test="cityCode != null">
city_code = #{cityCode}
</if>
+ <if test="provinceCode != null">
+ province_code = #{provinceCode}
+ </if>
+ </select>
+ <select id="byCodeGetMonitor" resultType="com.moral.entity.MonitorPoint">
+ select * from monitor_point
+ where
+ <if test="townCode != null">
+ town_code = #{townCode}
+ </if>
+ <if test="areaCode != null">
+ area_code = #{areaCode}
+ </if>
+ <if test="cityCode != null">
+ city_code = #{cityCode}
+ </if>
+ <if test="provinceCode != null">
+ province_code = #{provinceCode}
+ </if>
+ </select>
+
+ <select id="getOrgIdByMac" resultType="String">
+ SELECT m.`organization_id` orgId FROM monitor_point m
+ JOIN device d ON d.`monitor_point_id` = m.`id`
+ AND d.`mac`= #{mac}
+ </select>
+
+ <select id="getMonitorName" resultType="java.lang.String">
+ select name from monitor_point where id=#{mpId}
+ </select>
+
+ <select id="getMonitorPointsByOrganizationIds" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM monitor_point m
+ WHERE m.`organization_id`
+ IN
+ <foreach collection="orgIds" item="orgId" close=")" open="(" separator=",">
+ #{orgId}
+ </foreach>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0