|
|
|
@ -334,7 +334,7 @@ |
|
|
|
<where> |
|
|
|
and device_info.flag = 0 and basic_monitoring_asset.flag != 1 |
|
|
|
and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1 |
|
|
|
and alert_history.source_type = 1 |
|
|
|
# and alert_history.source_type = 1 |
|
|
|
<include refid="deviceDataCommonWhere"/> |
|
|
|
<choose> |
|
|
|
<when test="searchType == 1"> |
|
|
|
@ -397,7 +397,7 @@ |
|
|
|
and device_info.flag = 0 and basic_monitoring_asset.flag != 1 |
|
|
|
and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1 |
|
|
|
and ddgr.device_group_id = #{deviceGroupId} |
|
|
|
and alert_history.source_type = 1 |
|
|
|
# and alert_history.source_type = 1 |
|
|
|
<include refid="deviceDataCommonWhere"/> |
|
|
|
<choose> |
|
|
|
<when test="searchType == 1"> |
|
|
|
|