From 6f5dc4ff458a78ec4ff341ca33b5bd5e99fbc8e5 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 13 Jul 2018 14:38:18 +0800
Subject: [PATCH] demo
---
src/main/resources/mapper/HistoryMapper.xml | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 3c0576f..bef36f5 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -46,11 +46,14 @@
mp.`name`
</if>
<if test="dimension == 'region'">
- mp.${nextLevel}_code AS 'code'
+ r.${nextLevel}_name AS 'name'
</if>
FROM
<if test="dimension == 'profession'">
profession p ,
+ </if>
+ <if test="dimension == 'region'">
+ ${nextLevel} r,
</if>
device d,
${table} h,
@@ -64,6 +67,9 @@
AND mp.${regionType}_code = #{regionCode}
<if test="dimension == 'profession'">
AND d.profession_id = p.id
+ </if>
+ <if test="dimension == 'region'">
+ AND r.${nextLevel}_code = mp.${nextLevel}_code
</if>
<if test="orgIds != null and orgIds.size > 0">
AND mp.organization_id IN
@@ -88,9 +94,8 @@
</if>
</select>
- <select id="selectNextLevelRegion" resultType="java.util.Map">
+ <select id="selectNextLevelRegion" resultType="string">
SELECT
- ${nextLevel}_code AS 'code',
${nextLevel}_name AS 'name'
FROM
${nextLevel}
@@ -101,7 +106,7 @@
<select id="getDischargeByRegion" resultType="java.util.Map">
SELECT
mp.`name`,
- dis.`value` -> '$.e1' 'value'
+ dis.`value` -> '$.${sensorKey}' 'value'
FROM
monitor_point mp,
discharge dis
@@ -110,4 +115,17 @@
AND mp.${regionType}_code = #{regionCode}
AND dis.`year` = #{year}
</select>
+
+ <select id="getValueByMacAndSize" resultType="java.util.Map">
+ SELECT
+ value,
+ time
+ FROM
+ history
+ WHERE
+ mac = #{mac}
+ ORDER BY
+ time DESC
+ LIMIT #{size}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0