logging

沈斌

2018-06-09 938b35db33710afcbf42fe0b0b1137a6c6a0d7b4

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -13,7 +13,22 @@
      FROM

         history_minutely

      WHERE

         mac = #{mac}

         mac IN

            (SELECT

               d.mac 
            FROM

               device d,

               monitor_point mp 
            WHERE

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

               AND mp.id =   #{monitorPointId}

               </if>

               <if test="mac != null">

               AND d.mac = #{mac}

               </if>

            )	
      AND time >= #{start}

      AND time &lt; #{end}

   </select>

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

            <if test="monitorPointId != null">

            AND mp.id =   #{monitorPointId}

            </if>

            <if test="professionId != null">

            AND d.profession_id = #{professionId}

            </if>

         )   

      </if>

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