From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/HistoryMapper.xml | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 2ca98f3..f7c82a8 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.moral.mapper.HistoryMapper">
- <select id="getAreaAllDataByAccount" resultType="java.util.LinkedHashMap">
+<mapper namespace="com.moral.mapper.HistoryMapper">
+ <select id="selectValueByMacAndTime" resultType="java.lang.String">
+ select `value` from history
+ where time = #{time} and mac = #{mac}
+ limit 0,1
+ </select>
+ <select id="getAreaAllDataByAccount" resultType="java.util.Map">
SELECT
- <if test="macKey == 'all'">
- ${queryColumns}
- </if>
- <if test="macKey != 'all'">
- d.`name`,
- AVG( h.`value` -> ${macKey}) avg
- </if>
+ <if test="macKey != null">
+ d.`name`,
+ </if>
+ <foreach collection="sensorKeys" separator="," item="sensorKey">
+ AVG(h.`value` ->'$.${sensorKey}[0]') AS '${sensorKey}'
+ </foreach>
FROM
history h,
device d,
@@ -18,20 +22,17 @@
mp.area_code = #{areaCode}
AND h.time >= #{start}
AND h.time < #{end}
+ AND h.mac = d.mac
+ AND d.monitor_point_id = mp.id
<if test="orgIds != null and orgIds.size > 0">
AND mp.organization_id IN
<foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
#{listItem}
</foreach>
</if>
- AND h.mac = d.mac
- AND d.monitor_point_id = mp.id
- <if test="macKey != 'all'">
+ <if test="macKey != null">
GROUP BY d.id
- ORDER BY avg desc
+ ORDER BY ${macKey} desc
</if>
</select>
-
-
-
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0