优化 报警数据查询

xufenglei

2018-04-27 4686914dd93138d69e9280a88f24a51a711f52be

 src/main/resources/mapper/AlarmMapper.xml

@@ -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,11 +61,14 @@
               <if test="mac != null">

               AND d.mac =   #{mac}

               </if>

               <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