sensor

lizijie

2019-06-12 09c3a7d258c7bde571f74050156437d2eb86c6c6

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -13,7 +13,20 @@
      FROM

         history_minutely

      WHERE

         mac = #{mac}

         mac IN

            (SELECT

               d.mac 
            FROM

               device d

            WHERE

               d.is_delete = 0 
               <if test="monitorPointId != null">

               AND d.monitor_point_id = #{monitorPointId}

               </if>

               <if test="mac != null">

               AND d.mac = #{mac}

               </if>

            )	
      AND time >= #{start}

      AND time &lt; #{end}

   </select>

@@ -25,7 +38,7 @@
            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'

         </foreach>

      FROM

         history_minutely h

         history_${timeUnits} h

      WHERE

         h.time >= #{start}

      AND h.time <![CDATA[<]]> #{end}

@@ -53,6 +66,9 @@
            <if test="monitorPointId != null">

            AND mp.id =   #{monitorPointId}

            </if>

            <if test="professionId != null">

            AND d.profession_id = #{professionId}

            </if>

         )   

      </if>