Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 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>