From 51a9ac0eaa65d214b338685b7cb83c21a5a32589 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 28 Jun 2018 16:34:46 +0800
Subject: [PATCH] 刷新redis 里设备信息 添加 versionNum.并保持多处调用一致。
---
src/main/resources/mapper/HistoryMapper.xml | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 620c6e0..2408a33 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -1,6 +1,11 @@
<?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 != null">
@@ -30,4 +35,66 @@
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