From 288d18ea9f93236f179cbd333dc21bebda7c023a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:12:54 +0800
Subject: [PATCH] 设备，监控点 功能增强
---
src/main/resources/mapper/AlarmDailyMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/AlarmDailyMapper.xml b/src/main/resources/mapper/AlarmDailyMapper.xml
index db13fc0..10b3bbd 100644
--- a/src/main/resources/mapper/AlarmDailyMapper.xml
+++ b/src/main/resources/mapper/AlarmDailyMapper.xml
@@ -64,6 +64,9 @@
<if test="level != null">
AND h.state = #{level}
</if>
+ <if test="professionId != null">
+ AND d.profession_id = #{professionId}
+ </if>
GROUP BY
<if test="dimension=='monitorPoint'">
mp.id,
@@ -80,7 +83,7 @@
SELECT
DATE_FORMAT(h.time, '%Y-%m') AS 'time'
<foreach collection="sensorKeys" open="," separator="+" close=" AS 'sum' " item="sensorKey">
- COUNT(json -> '$.${sensorKey}')
+ COUNT(json -> '$.${sensorKey}')
</foreach>
FROM
alarm_daily h
@@ -93,5 +96,20 @@
GROUP BY
DATE_FORMAT(h.time, '%Y-%m')
</select>
+
+ <select id="getAlarmDataByMonth" resultType="java.util.Map">
+ SELECT
+ <foreach collection="sensors" separator="," item="sensor">
+ COUNT(json -> '$.${sensor.sensorKey}') AS '${sensor.sensorKey}'
+ </foreach>
+ FROM
+ alarm_daily h
+ WHERE
+ h.time >= #{start}
+ AND h.time <![CDATA[<]]> #{end}
+ <if test="state != null">
+ AND h.state = #{state}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0