change -修物联网实时数据根据采集时间和记录时间范围查询，修改数据根据采集时间倒序排列

os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml

@@ -44,7 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTWTempertureDataVo"/>
         <where>  
             <if test="monitorId != null  and monitorId != ''"> and twtd.monitorId = #{monitorId}</if>
-            <if test="collectTime != null "> and twtd.collectTime = #{collectTime}</if>
+            <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
+                and twtd.collectTime between #{params.beginCollectTime} and #{params.endCollectTime}
+            </if>
             <if test="tempreture != null "> and twtd.tempreture = #{tempreture}</if>
             <if test="humidity != null "> and twtd.humidity = #{humidity}</if>
             <if test="illuminance != null "> and twtd.illuminance = #{illuminance}</if>
@@ -53,9 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="recodeTime != null "> and twtd.recodeTime = #{recodeTime}</if>
             <if test="alarmType != null "> and twtd.alarmType = #{alarmType}</if>
             <if test="confirmPersonID != null "> and twtd.confirmPersonID = #{confirmPersonID}</if>
-            <if test="confirmTime != null "> and twtd.confirmTime = #{confirmTime}</if>
+            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
+                and twtd.recodeTime between #{params.beginRecordTime} and #{params.endRecordTime}
+            </if>
             <if test="confirmFlag != null "> and twtd.confirmFlag = #{confirmFlag}</if>
         </where>
+        order by twtd.collectTime desc
     </select>
     
     <select id="selectTWTempertureDataByObjid" parameterType="Long" resultMap="TWTempertureDataResult">