三级阀值

fengxiang

2017-10-31 5e1b6a8624f63116b7e0750b0760557c4bfd2f5b

 src/main/resources/mapper/HistoryEntityMapper.xml

@@ -238,7 +238,6 @@
  </select>



   <select id="getAverageByAll" resultType="map">

<!-- 
      SELECT

         h.mac_key,

         AVG(h.mac_value) avg

@@ -261,32 +260,6 @@
      AND h.time &lt; #{end}

      GROUP BY

         h.mac_key

 -->



      SELECT

         mac_key,

         AVG(mac_value) avg

      FROM

         history h

         <if test="orgIds!=null and orgIds.size > 0">

            JOIN (

               SELECT

                  e.mac

               FROM

                  equipment e,

                  org_equ oe

               WHERE

                  e.id = oe.equid

               AND oe.orgid IN

               <foreach collection="orgIds" item="listItem" open="(" separator="," close=")" >

                  #{listItem}

               </foreach>

            ) e ON h.mac = e.mac

         </if>

         WHERE h.time &gt; #{start}

         AND h.time &lt; #{end}

      GROUP BY

         mac_key

   </select>



   <select id="getEquipmentStates" resultType="map">