From 0099e6c9db0c858cb6905477830c79305dca39bb Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 13:42:27 +0800
Subject: [PATCH] 校准值

---
 src/main/resources/mapper/MonitorPointMapper.xml |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 90ddde8..c4da432 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,7 +173,7 @@
 		and o.id=mp.organization_id
 		and a.id=#{id};
 	</select>
-	<select id="byIdGetMonitorPoint" resultType="com.moral.entity.MonitorPoint">
+	<select id="byIdGetMonitorPoint" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
 		SELECT * FROM `monitor_point` where id=#{id}
 	</select>
 
@@ -188,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}
@@ -199,5 +199,34 @@
         <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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0