From 71af09a7d35a1146122776bebac8d51c1903beed Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 04 May 2018 08:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/AlarmMapper.xml | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index 892c450..b3baecf 100644
--- a/src/main/resources/mapper/AlarmMapper.xml
+++ b/src/main/resources/mapper/AlarmMapper.xml
@@ -1,7 +1,7 @@
<?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.AlarmMapper">
- <select id="getAlarmData" resultType="java.util.Map">
+ <select id="getAlarmData" resultType="java.util.LinkedHashMap">
SELECT
<if test="dimension=='monitorPoint'">
`name`,
@@ -32,11 +32,11 @@
</foreach>
</when>
<otherwise>
- DATE_FORMAT( h.time, '%Y-%m-%d' ) AS 'time'
+ h.time
</otherwise>
</choose>
FROM
- alarm h,
+ alarm_daily h,
device d,
monitor_point mp
WHERE d.monitor_point_id = mp.id
@@ -61,19 +61,39 @@
<if test="mac != null">
AND d.mac = #{mac}
</if>
- <if test="state != null">
- AND h.state = #{state}
+ <if test="level != null">
+ AND h.state = #{level}
</if>
GROUP BY
<if test="dimension=='monitorPoint'">
mp.id,
</if>
- DATE_FORMAT( h.time, '%Y-%m-%d' )
+ h.time
) a
<if test="dimension=='monitorPoint'">
GROUP BY name
</if>
</select>
-
+ <select id="countByTimes" resultType="java.util.Map">
+ select
+ <if test="format !=null">
+ DATE_FORMAT(time,#{format}) as time,
+ </if>
+ COUNT(*) as count from alarm
+ <where>
+ <if test="start != null">
+ time >= #{start}
+ </if>
+ <if test="end != null">
+ and time
+ <![CDATA[
+ <=
+ ]]> #{end}
+ </if>
+ </where>
+ <if test="format !=null">
+ GROUP BY DATE_FORMAT(time,#{format}) ;
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0