From 4f708def438b40d2a55c4bb479eb67acf8076a95 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 25 Apr 2018 13:09:59 +0800
Subject: [PATCH] 微信展示数据详情页面
---
src/main/resources/mapper/AlarmMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index cad7fec..892c450 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`,
@@ -61,6 +61,9 @@
<if test="mac != null">
AND d.mac = #{mac}
</if>
+ <if test="state != null">
+ AND h.state = #{state}
+ </if>
GROUP BY
<if test="dimension=='monitorPoint'">
mp.id,
--
Gitblit v1.8.0