地图更新

fengxiang

2018-08-13 b548f17e642210ac5301db8493b5b5fe28dfab65

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -17,13 +17,11 @@
            (SELECT

               d.mac 

            FROM

               device d,

               monitor_point mp 
               device d

            WHERE

               d.is_delete = 0 

               AND d.monitor_point_id = mp.id 
               <if test="monitorPointId != null">

               AND mp.id =   #{monitorPointId}

               AND d.monitor_point_id = #{monitorPointId}

               </if>

               <if test="mac != null">

               AND d.mac = #{mac}

@@ -33,7 +31,7 @@
      AND time &lt; #{end}

   </select>

   

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

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

      SELECT

         DATE_FORMAT(time, #{typeFormat}) time

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