|
|
@ -40,8 +40,9 @@ |
|
|
|
From psdc_thermometer_htdata pth |
|
|
|
From psdc_thermometer_htdata pth |
|
|
|
LEFT JOIN psdc_device pd On pd.device_id = pth.device_id |
|
|
|
LEFT JOIN psdc_device pd On pd.device_id = pth.device_id |
|
|
|
<where> |
|
|
|
<where> |
|
|
|
|
|
|
|
pd.device_model = "温度传感器" |
|
|
|
<if test="installAddress != null and installAddress != ''"> |
|
|
|
<if test="installAddress != null and installAddress != ''"> |
|
|
|
pd.device_address LIKE concat('%', #{installAddress}, '%') |
|
|
|
And pd.device_address LIKE concat('%', #{installAddress}, '%') |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 --> |
|
|
|
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 --> |
|
|
|
And date_format(pth.update_time,'%Y-%m-%d %H:%i:%S') >= date_format(#{beginTime},'%Y-%m-%d %H:%i:%S') |
|
|
|
And date_format(pth.update_time,'%Y-%m-%d %H:%i:%S') >= date_format(#{beginTime},'%Y-%m-%d %H:%i:%S') |
|
|
|