|
|
|
@ -52,7 +52,7 @@ |
|
|
|
#{deviceId} |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
and device_info.flag = 0 and (device_info.device_id LIKE '%\_85' or device_info.device_id LIKE '%\_85_9003') |
|
|
|
and device_info.flag = 0 and (device_info.device_id LIKE '%\_85' or device_info.device_id LIKE '%\_85_9003' or device_info.device_id LIKE '%\_131_5') |
|
|
|
and basic_monitoring_asset.flag != 1 and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1 |
|
|
|
and type.device_category_id in |
|
|
|
<foreach collection="categoryIdList" item="categoryId" open="(" separator="," close=")"> |
|
|
|
@ -455,7 +455,7 @@ |
|
|
|
#{companyId} |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
and device_info.flag = 0 and (device_info.device_id LIKE '%\_85' or device_info.device_id LIKE '%\_85_9003') |
|
|
|
and device_info.flag = 0 and (device_info.device_id LIKE '%\_85' or device_info.device_id LIKE '%\_85_9003' or device_info.device_id LIKE '%\_131_5') |
|
|
|
and basic_monitoring_asset.flag != 1 and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1 |
|
|
|
and type.device_category_id in |
|
|
|
<foreach collection="categoryIdList" item="categoryId" open="(" separator="," close=")"> |
|
|
|
|