From af8dd6eccb0aab770246ae44db1cde4e531416c5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 15:10:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index fbe298a..cb2cba0 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`
--
Gitblit v1.8.0