mac地址唯一性服务，查询数据行业功能添加。

fengxiang

2018-05-15 781c9724dac7d3698161ecb845e55ba1800b8ec1

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -20,8 +20,8 @@
   

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

      SELECT

         DATE_FORMAT(time, #{typeFormat}) time,

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

         DATE_FORMAT(time, #{typeFormat}) time

         <foreach  collection="sensorKeys" open="," separator="," item="sensorKey">

            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'

         </foreach>

      FROM

@@ -93,6 +93,9 @@
                <if test='"DEVICE"==dataCondition.areaRange.toString()'>

                  and dev.id = #{dataCondition.areaRangeId}

                </if>

               <if test='"PROFESSION"==dataCondition.deviceDimension.toString()'>

                  and dev.profession_id = #{dataCondition.dimensionValue}

               </if>

               <if test='"MONITORPOINT"==dataCondition.areaRange.toString()'>

                  and mpt.id = #{dataCondition.areaRangeId}

               </if>