Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-07 052fd7444c1c2852fd9fd07876438c2ed9a5b45a

 src/main/resources/mapper/AlarmDailyMapper.xml

@@ -92,6 +92,21 @@
         </if>

      GROUP BY

          DATE_FORMAT(h.time, '%Y-%m')         

   </select>



   <select id="getAlarmDataByMonth" resultType="java.util.Map">

      SELECT

         <foreach collection="sensors" separator="," item="sensor">

            COUNT(json -> '$.${sensor.sensorKey}') AS '${sensor.sensorKey}'

         </foreach>

      FROM

          alarm_daily h

      WHERE

         h.time >= #{start}

          AND h.time <![CDATA[<]]> #{end}

         <if test="state != null">

         AND h.state = #{state}

         </if>

   </select>

   

</mapper>