From 4686914dd93138d69e9280a88f24a51a711f52be Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 27 Apr 2018 09:01:57 +0800
Subject: [PATCH] 优化 报警数据查询
---
src/main/resources/mapper/AlarmMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index 892c450..f053aeb 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,14 +61,14 @@
<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
--
Gitblit v1.8.0