From 788489c7e95352a11cf5ec40a7a9c7277e5cc0f3 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 09:19:53 +0800
Subject: [PATCH] 安全跨域设置
---
src/main/resources/mapper/DeviceMapper.xml | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index fbe298a..bd99802 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -81,7 +81,7 @@
</if>
)
</select>
- <select id="getDeviceStatesByAccount" resultType="map">
+ <select id="getDeviceStatesByAccount" resultType="java.util.Map">
SELECT
COUNT( d.state ) count,
d.state
@@ -98,8 +98,16 @@
</if>
GROUP BY d.state
</select>
-
- <select id="getSensorsByDevice" resultType="map">
+ <select id="selectByOrgIdAndDevName" resultMap="BaseResultMap">
+ SELECT * from device dev
+ left join monitor_point mpt on dev.monitor_point_id = mpt.id
+ where
+ mpt.organization_id = #{orgId}
+ <if test="devName!=null and ''!=devName">
+ and dev.name like #{devName}
+ </if>
+ </select>
+ <select id="getSensorsByDevice" resultType="java.util.Map">
SELECT
s.`key`,
s.`name`
@@ -114,4 +122,23 @@
ORDER BY
s.id
</select>
+ <select id="getDeviceVersionIdByMonitorPoint" resultType="map">
+ SELECT
+ device_version_id deviceVersionId
+ FROM
+ device
+ WHERE
+ monitor_point_id = #{monitorPoint}
+ GROUP BY
+ device_version_id
+ </select>
+ <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
+ SELECT
+ mac
+ FROM
+ device
+ WHERE
+ monitor_point_id = #{monitorPointId}
+ AND device_version_id = #{deviceVersionId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0