From ed8f0aeffb619c0540b16420320973207c55f015 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 08:52:49 +0800
Subject: [PATCH] 地图点击关闭弹窗
---
src/main/resources/mapper/DeviceMapper.xml | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 8ce75ca..846ad57 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -116,22 +116,38 @@
</select>
<select id="getDeviceVersionIdByMonitorPoint" resultType="map">
SELECT
- device_version_id deviceVersionId
+ device_version_id deviceVersionId
FROM
- device
+ device
WHERE
- monitor_point_id = #{monitorPoint}
+ monitor_point_id = #{monitorPoint}
GROUP BY
- device_version_id
+ device_version_id
+ </select>
+ <select id="getDeviceVersionIdByAreaCode" resultType="int">
+ SELECT DISTINCT
+ d.device_version_id
+ FROM
+ monitor_point mp,
+ device d
+ WHERE
+ mp.area_code = #{areaCode}
+ AND d.monitor_point_id = mp.id
+ <if test="orgIds != null and orgIds.size > 0">
+ AND mp.organization_id IN
+ <foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
+ #{listItem}
+ </foreach>
+ </if>
</select>
<select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
SELECT
- mac
+ mac
FROM
- device
+ device
WHERE
- monitor_point_id = #{monitorPointId}
- AND device_version_id = #{deviceVersionId}
+ monitor_point_id = #{monitorPointId}
+ AND device_version_id = #{deviceVersionId}
</select>
<select id="selectByOrgIdAndDevName" resultMap="BaseResultMap">
SELECT dev.*,dve.version as device_version_value from device dev
@@ -178,7 +194,7 @@
</resultMap>
<!-- resultMap������ -->
<select id="selectOrganizationIds" resultType="INTEGER">
- call proc_organization_id_select(#{id,jdbcType=INTEGER});
+ call proc_organizationIds_GetByDeviceId(#{id,jdbcType=INTEGER});
</select>
<select id="selectWithOrgIdsByMac" parameterType="java.lang.String" resultMap="BaseResultWithOrgIdsMap">
select
--
Gitblit v1.8.0