设备上报详情问题修改 gengdidi

gassafety-system/src/main/resources/mapper/system/TDeviceReportDataMapper.xml

@@ -146,15 +146,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTDeviceReportDataByDeviceNum" parameterType="String" resultMap="TDeviceReportDataResult">
-        select max(report_time) report_time, device_report_data_id, device_num, standard_condition_accumulation, working_condition_accumulation, residual_quantity, standard_condition_flow, working_condition_flow, temperature, pressure, communication_status, device_status, create_time, update_time
+        select report_time, device_report_data_id, device_num, standard_condition_accumulation, working_condition_accumulation, residual_quantity, standard_condition_flow, working_condition_flow, temperature, pressure, communication_status, device_status, create_time, update_time
         from t_device_report_data
         where device_num = #{deviceNum}
+        ORDER BY create_time DESC
+        LIMIT 1
     </select>
 
     <select id="getTDeviceReportDataList" parameterType="String" resultMap="TDeviceReportDataResult">
         select report_time, device_report_data_id, device_num, standard_condition_accumulation, working_condition_accumulation, residual_quantity, standard_condition_flow, working_condition_flow, temperature, pressure, communication_status, device_status, create_time, update_time
         from t_device_report_data
-        where device_num = #{deviceNum} and report_time &gt;= DATE_SUB(NOW(),INTERVAL 2 HOUR)
+        where device_num = #{deviceNum} and create_time &gt;= DATE_SUB(NOW(),INTERVAL 2 HOUR)
     </select>
 
     <select id="getAlarmDeviceReportDataList" parameterType="TDeviceReportData" resultMap="TDeviceReportDataResult">