From e45bad6cf75f6da4e8002020755cc07a55892e14 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 29 Jun 2018 09:49:05 +0800
Subject: [PATCH] 接口 升级
---
src/main/resources/mapper/HistoryMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 2408a33..3c0576f 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -38,7 +38,7 @@
<select id="getRegionRankingData" resultType="java.util.Map">
SELECT
- AVG( h.`value` -> '$.${sensorKey}[0]' ) avg ,
+ AVG( h.${column} -> '$.${sensorKey}[0]' ) avg ,
<if test="dimension == 'profession'">
p.`name`
</if>
@@ -53,7 +53,7 @@
profession p ,
</if>
device d,
- history h,
+ ${table} h,
monitor_point mp
WHERE
d.mac = h.mac
@@ -61,7 +61,7 @@
AND mp.is_delete = '0'
AND d.monitor_point_id = mp.id
AND h.time >= #{start}
- AND mp.${regionType} = #{regionCode}
+ AND mp.${regionType}_code = #{regionCode}
<if test="dimension == 'profession'">
AND d.profession_id = p.id
</if>
@@ -95,6 +95,19 @@
FROM
${nextLevel}
WHERE
- ${regionType} = #{regionCode}
+ ${regionType}_code = #{regionCode}
+ </select>
+
+ <select id="getDischargeByRegion" resultType="java.util.Map">
+ SELECT
+ mp.`name`,
+ dis.`value` -> '$.e1' 'value'
+ FROM
+ monitor_point mp,
+ discharge dis
+ WHERE
+ dis.monitor_point_id = mp.id
+ AND mp.${regionType}_code = #{regionCode}
+ AND dis.`year` = #{year}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0