From 4a41bd4e105385b5460e5a81c8b67e5f701a262b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 04 May 2018 08:55:13 +0800
Subject: [PATCH] 首页 工作台

---
 src/main/resources/mapper/AlarmMapper.xml |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index 29576fc..1417b37 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.LinkedHashMap">
+	<select id="getAlarmData" resultType="java.util.Map">
 		SELECT
 			<if test="dimension=='monitorPoint'">
 				`name`,
@@ -75,5 +75,25 @@
 		</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