调整 计算平均值算法

xufenglei

2018-03-30 71d49c588d62385a57a2ea5434f3c407a1d5c1ca

 src/main/resources/mapper/HistoryMapper.xml

@@ -3,13 +3,12 @@
<mapper namespace="com.moral.mapper.HistoryMapper">
   <select id="getAreaAllDataByAccount" resultType="java.util.LinkedHashMap">

      SELECT

      <if test="macKey == 'all'">

         ${queryColumns}

      </if>	
      <if test="macKey != 'all'">

         d.`name`,

         AVG( h.`value` -> ${macKey}) avg

      </if>	
         <if test="macKey != null">

            d.`name`,

         </if>	
         <foreach  collection="sensorKeys" separator="," item="sensorKey">

            AVG(h.`value` ->'$.${sensorKey}[0]') AS '${sensorKey}'

         </foreach>

      FROM

         history h,

         device d,

@@ -26,15 +25,9 @@
            #{listItem}

         </foreach>

      </if>

      <if test="deviceVersionId != null">

         AND d.device_version_id = #{deviceVersionId} 
      </if>

      <if test="macKey != 'all'">

      <if test="macKey != null">

         GROUP BY d.id

         ORDER BY avg desc

         ORDER BY ${macKey} desc

      </if>   

   </select>

	


	
</mapper>