|
|
|
|
@ -117,7 +117,7 @@ |
|
|
|
|
</where> |
|
|
|
|
</select> |
|
|
|
|
|
|
|
|
|
<!--分页查询指定行数据--> |
|
|
|
|
<!--分页查询指定行数据 Where !(device_model = "温度传感器" And parent_id = 0) --> |
|
|
|
|
<select id="queryAllByLimit" resultMap="PsdcDeviceMap3"> |
|
|
|
|
Select |
|
|
|
|
pd.device_id, device_name, device_address, device_status, device_runstatus, parent_id, device_model, su.user_id, su.user_name, is_control, |
|
|
|
|
@ -126,7 +126,7 @@ |
|
|
|
|
Left Join sys_user su On su.user_id = pd.user_id |
|
|
|
|
Left Join psdc_electric_rtdata per On per.device_id = pd.device_id |
|
|
|
|
Left Join psdc_thermometer_rtdata ptr On ptr.device_id = pd.device_id |
|
|
|
|
Where !(device_model = "温度传感器" And parent_id = 0) |
|
|
|
|
<where> |
|
|
|
|
<if test="deviceId != null and deviceId != ''"> |
|
|
|
|
and pd.device_id = #{deviceId} |
|
|
|
|
</if> |
|
|
|
|
@ -175,6 +175,7 @@ |
|
|
|
|
<if test="updateTime != null and updateTime != ''"> |
|
|
|
|
and update_time = #{updateTime} |
|
|
|
|
</if> |
|
|
|
|
</where> |
|
|
|
|
Order by pd.device_id |
|
|
|
|
</select> |
|
|
|
|
|
|
|
|
|
|
