From 7f33dd19c55ef3980129ff3034f9eaf89a9bcf58 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 30 Nov 2020 17:27:01 +0800
Subject: [PATCH] 修改monitorPointMapper

---
 src/main/resources/mapper/MonitorPointMapper.xml |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index c1d3c7d..30bfe68 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -9,6 +9,7 @@
         <result column="province_code" jdbcType="INTEGER" property="provinceCode"/>
         <result column="city_code" jdbcType="INTEGER" property="cityCode"/>
         <result column="area_code" jdbcType="INTEGER" property="areaCode"/>
+        <result column="town_code" jdbcType="INTEGER" property="townCode"/>
         <result column="organization_id" jdbcType="INTEGER" property="organizationId"/>
         <result column="address" jdbcType="VARCHAR" property="address"/>
         <result column="is_delete" jdbcType="CHAR" property="isDelete"/>
@@ -172,6 +173,9 @@
 		and o.id=mp.organization_id
 		and a.id=#{id};
 	</select>
+	<select id="byIdGetMonitorPoint" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
+		SELECT * FROM `monitor_point` where id=#{id}
+	</select>
 
     <select id="getFirstMonitorPointByAreaCode" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
 		select * from monitor_point where area_code=#{areaCode} limit 0,1
@@ -185,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}
@@ -196,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