From 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 26 Mar 2018 14:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/SensorMapper.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 3894d48..fd3a45b 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -4,13 +4,35 @@
<resultMap id="BaseResultMap" type="com.moral.entity.Sensor" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="name" property="name" jdbcType="VARCHAR" />
- <result column="key" property="key" jdbcType="VARCHAR" />
+ <result column="sensor_key" property="sensorKey" jdbcType="VARCHAR" />
<result column="upper" property="upper" jdbcType="DOUBLE" />
<result column="lower" property="lower" jdbcType="DOUBLE" />
<result column="unit" property="unit" jdbcType="VARCHAR" />
<result column="description" property="description" jdbcType="VARCHAR" />
</resultMap>
<sql id="Base_Column_List" >
- id, name, key, upper, lower, unit, description
+ id, name, sensor_key, upper, lower, unit, description
</sql>
+ <select id="selectByVersionId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+ select
+ <include refid="Base_Column_List" />
+ from sensor sen
+ where EXISTS
+ ( select id
+ from device_version_sensor dvs
+ where sen.id = dvs.sensor_id and dvs.device_version_id = #{deviceVersionId,jdbcType=INTEGER}
+ )
+ </select>
+
+ <select id="getSensorsByDeviceVersionId" resultType="java.util.Map">
+ SELECT
+ s.*
+ FROM
+ device_version_sensor dvs,
+ sensor s
+ WHERE
+ dvs.sensor_id = s.id
+ AND dvs.device_version_id = #{deviceVersionId}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0