From 409851cc3f33d3fd016e20518f90a2c093e9e1db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 19 May 2020 16:58:54 +0800
Subject: [PATCH] alarm相关接口更新
---
src/main/resources/mapper/AlarmMapper.xml | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index e2a7007..f0cbc24 100644
--- a/src/main/resources/mapper/AlarmMapper.xml
+++ b/src/main/resources/mapper/AlarmMapper.xml
@@ -1,25 +1,46 @@
<?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="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>
+ <select id="countByTimes" resultType="java.util.Map">
+ select
+ <if test="format !=null">
+ DATE_FORMAT(a.time,#{format}) as time,
+ </if>
+ count(*) as count
+ from
+ (<foreach collection="list" item="item" separator="union">
+ select
+ * from
+ alarm_${item}
+ </foreach>) as a
+ where
+ a.time >= #{start}
+ and a.time
+ <![CDATA[<=]]> #{end}
+ <if test="format !=null">
+ GROUP BY DATE_FORMAT(a.time,#{format}) ;
+ </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