fengxiang
2018-05-04 4a41bd4e105385b5460e5a81c8b67e5f701a262b
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,8 +61,8 @@
               <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'">
@@ -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>