行业 优化

xufenglei

2018-05-17 7486f185f3a48b75f163a99ecd7546b525018dd0

 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

@@ -52,6 +52,9 @@
            </if>

            <if test="monitorPointId != null">

            AND mp.id =   #{monitorPointId}

            </if>

            <if test="professionId != null">

            AND d.profession_id = #{professionId}

            </if>

         )   

      </if>

@@ -93,6 +96,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>