From d32fa50fca18a3fff89b9ec22deaa3d964ddd19b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 12:34:27 +0800
Subject: [PATCH] 大屏布局监控点 返回配置数据
---
src/main/resources/mapper/HistoryMapper.xml | 88 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 2527cdf..2408a33 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">
+<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.LinkedHashMap">
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,
@@ -26,15 +30,71 @@
#{listItem}
</foreach>
</if>
- <if test="deviceVersionId != null">
- AND d.device_version_id = #{deviceVersionId}
- </if>
- <if test="macKey != 'all'">
+ <if test="macKey != null">
GROUP BY d.id
- ORDER BY avg desc
+ ORDER BY ${macKey} desc
</if>
</select>
-
+ <select id="getRegionRankingData" resultType="java.util.Map">
+ SELECT
+ AVG( h.`value` -> '$.${sensorKey}[0]' ) avg ,
+ <if test="dimension == 'profession'">
+ p.`name`
+ </if>
+ <if test="dimension == 'monitorPoint'">
+ mp.`name`
+ </if>
+ <if test="dimension == 'region'">
+ mp.${nextLevel}_code AS 'code'
+ </if>
+ FROM
+ <if test="dimension == 'profession'">
+ profession p ,
+ </if>
+ device d,
+ history h,
+ monitor_point mp
+ WHERE
+ d.mac = h.mac
+ AND d.is_delete = '0'
+ AND mp.is_delete = '0'
+ AND d.monitor_point_id = mp.id
+ AND h.time >= #{start}
+ AND mp.${regionType} = #{regionCode}
+ <if test="dimension == 'profession'">
+ AND d.profession_id = p.id
+ </if>
+ <if test="orgIds != null and orgIds.size > 0">
+ AND mp.organization_id IN
+ <foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
+ #{listItem}
+ </foreach>
+ </if>
+ GROUP BY
+ <if test="dimension == 'profession'">
+ p.id
+ </if>
+ <if test="dimension == 'monitorPoint'">
+ mp.id
+ </if>
+ <if test="dimension == 'region'">
+ mp.${nextLevel}_code
+ </if>
+ ORDER BY
+ avg DESC
+ <if test="dimension == 'monitorPoint'">
+ LIMIT 0,50
+ </if>
+ </select>
+ <select id="selectNextLevelRegion" resultType="java.util.Map">
+ SELECT
+ ${nextLevel}_code AS 'code',
+ ${nextLevel}_name AS 'name'
+ FROM
+ ${nextLevel}
+ WHERE
+ ${regionType} = #{regionCode}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0