From bc6aaea416da40038dee2df1b3de4a1581da2a48 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Jul 2020 10:07:44 +0800
Subject: [PATCH] 臭氧预测update,根据城市名查询预测和实际数据

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

diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 8ece846..941d1b8 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,44 @@
 			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>
+	<select id="getIdByOrganizationId" resultType="java.util.Map">
+			SELECT id
+			FROM monitor_point
+			WHERE organization_id IN
+				<foreach collection="organizationIdList" index="index" item="organizationId" open="(" separator="," close=")">  
+	            	#{organizationId}  
+	        	</foreach>
+	</select>
+
+	<select id="getDeviceList" resultType="com.moral.entity.Device">
+		SELECT d.* FROM `device` as d,monitor_point as mp
+		where d.monitor_point_id=mp.id
+		and mp.id=#{id}
+	</select>
+	<select id="getMonitorPointById" resultType="com.moral.entity.MonitorPoint">
+		select * from monitor_point where id=#{id}
+	</select>
+	<select id="getMonitorPointListByAccountId" resultType="com.moral.entity.MonitorPoint">
+		SELECT mp.* FROM account a,`monitor_point` mp,organization o
+		where a.organization_id=o.id
+		and o.id=mp.organization_id
+		and a.id=#{id};
+	</select>
+
+	<select id="getFirstMonitorPointByAreaCode" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
+		select * from monitor_point where area_code=#{areaCode} limit 0,1
+	</select>
+
+	<select id="getFirstMonitorPointByCityCode" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
+		select * from monitor_point where city_code=#{cityCode} limit 0,1
+	</select>
+
+	<select id="getFirstMonitorPointByProvinceCode" resultType="com.moral.entity.MonitorPoint" resultMap="BaseResultMap">
+		select * from monitor_point where province_code=#{provinceCode} limit 0,1
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0