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 | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index e9abda1..892c450 100644
--- a/src/main/resources/mapper/AlarmMapper.xml
+++ b/src/main/resources/mapper/AlarmMapper.xml
@@ -1,26 +1,40 @@
<?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`,
</if>
- <foreach collection="sensorKeys" item="sensorKey" separator=",">
- SUM( ${sensorKey} ) AS '${sensorKey}'
- </foreach>
- <foreach close=" AS 'sum' " collection="sensorKeys" item="sensorKey" open="," separator="+">
- SUM( ${sensorKey} )
- </foreach>
+ <choose>
+ <when test="sensorKeys.size > 0">
+ <foreach collection="sensorKeys" separator="," item="sensorKey">
+ SUM( ${sensorKey} ) AS '${sensorKey}'
+ </foreach>
+ <foreach collection="sensorKeys" open="," separator="+" close=" AS 'sum' " item="sensorKey">
+ SUM( ${sensorKey} )
+ </foreach>
+ </when>
+ <otherwise>
+ time
+ </otherwise>
+ </choose>
FROM
(
SELECT
<if test="dimension=='monitorPoint'">
mp.`name`,
</if>
- <foreach collection="sensorKeys" item="sensorKey" separator=",">
- CASE COUNT( json -> '$.${sensorKey}' ) WHEN 0 THEN 0 ELSE 1 END AS '${sensorKey}'
- </foreach>
+ <choose>
+ <when test="sensorKeys.size > 0">
+ <foreach collection="sensorKeys" separator="," item="sensorKey">
+ CASE COUNT( json -> '$.${sensorKey}' ) WHEN 0 THEN 0 ELSE 1 END AS '${sensorKey}'
+ </foreach>
+ </when>
+ <otherwise>
+ DATE_FORMAT( h.time, '%Y-%m-%d' ) AS 'time'
+ </otherwise>
+ </choose>
FROM
alarm h,
device d,
@@ -41,9 +55,15 @@
<if test="monitorPointId != null">
AND mp.id = #{monitorPointId}
</if>
+ <if test="organizationId != null">
+ AND mp.organization_id = #{organizationId}
+ </if>
<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