From ecacade37bf1704fb7e71d66f1b85867dffc6814 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 07 Jul 2020 15:52:34 +0800
Subject: [PATCH] update国控站、省控站、县控站图标
---
src/main/resources/mapper/MonitorPointMapper.xml | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 9088367..8b59ad0 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -61,7 +61,7 @@
address, is_delete, description
</sql>
<sql id="Relation_Province_City_Area_List">
- are.area_name, cti.city_name, pro.province_name
+ are.area_name, cti.city_name, pro.province_name, t.town_name, v.village_name
</sql>
<select id="selectWithAreaNameByExample" parameterType="tk.mybatis.mapper.entity.Example" resultMap="BaseResultMap">
select
@@ -88,7 +88,7 @@
</if>
)
</select>
- <select id="getMonitorPointsByAreaName" resultType="com.moral.entity.MonitorPoint">
+ <select id="getMonitorPointsByAreaName" resultMap="BaseResultMap">
SELECT
mp.*
FROM
@@ -109,7 +109,15 @@
SELECT mpt.* from monitor_point mpt
<where>
<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
- mpt.organization_id = #{orgId,jdbcType=VARCHAR}
+ (
+ 1 > 1
+ <if test="orgIds!=null and orgIds.size() > 0">
+ or mpt.organization_id in
+ <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
+ #{tempOrgId,jdbcType=INTEGER}
+ </foreach>
+ </if>
+ )
</if>
<![CDATA[
AND mpt.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
@@ -117,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>
@@ -131,4 +143,26 @@
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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0