修改查询条件及语句
This commit is contained in:
parent
2a997f68ce
commit
e851bdc3f7
|
|
@ -274,13 +274,13 @@
|
|||
|
||||
<select id="previewList" parameterType="com.nu.modules.tplink.camera.entity.CameraInfo" resultType="com.nu.modules.tplink.camera.entity.CameraInfo">
|
||||
select a.*,b.nu_name from (
|
||||
select id,nu_id,device_index,device_model,device_type,device_status from nu_iot_tplink_camera
|
||||
select id,nu_id,device_index,device_model,device_type,device_status,dimension from nu_iot_tplink_camera
|
||||
union all
|
||||
select id,nu_id,cid as device_index,'' as device_model,'sb' as device_type,relay_state as device_status from nu_iot_tq_water_meter
|
||||
select id,nu_id,cid as device_index,'' as device_model,'sb' as device_type,relay_state as device_status,'' as dimension from nu_iot_tq_water_meter
|
||||
union all
|
||||
select id,nu_id,cid as device_index,'' as device_model,'db' as device_type,relay_state as device_status from nu_iot_tq_electricity_meter
|
||||
select id,nu_id,cid as device_index,'' as device_model,'db' as device_type,relay_state as device_status,'' as dimension from nu_iot_tq_electricity_meter
|
||||
union all
|
||||
select id,nu_id,sn as device_index,'' as device_model,'wsdj' as device_type,status as device_status from nu_iot_yiweilian_humid_device
|
||||
select id,nu_id,sn as device_index,'' as device_model,'wsdj' as device_type,status as device_status,'' as dimension from nu_iot_yiweilian_humid_device
|
||||
) a
|
||||
left join nu_base_info b on a.nu_id = b.nu_id
|
||||
<where>
|
||||
|
|
@ -293,6 +293,9 @@
|
|||
<if test="params.deviceType != null and params.deviceType != ''">
|
||||
and a.device_type = #{params.deviceType}
|
||||
</if>
|
||||
<if test="params.dimension != null and params.dimension != ''">
|
||||
and a.dimension = #{params.dimension}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue