|
|
|
@ -746,7 +746,7 @@ |
|
|
|
a.patrol_point_id, |
|
|
|
(SELECT c.device_name FROM basedata_device c WHERE c.device_id = b.parent_id) parent_name, |
|
|
|
b.device_name, |
|
|
|
a.patrolpoint_name, |
|
|
|
a.patrol_point_name, |
|
|
|
a.alarm_threshold, |
|
|
|
a.alg_subtype_ids, |
|
|
|
IFNULL(a.update_time, a.create_time) AS update_time |
|
|
|
@ -759,7 +759,7 @@ |
|
|
|
AND a.alarm_threshold != '[]' |
|
|
|
AND ( a.alarm_threshold LIKE '%52%' OR a.alarm_threshold LIKE '%53%' ) |
|
|
|
<if test="deviceName != null and deviceName != ''">and b.device_name = #{deviceName}</if> |
|
|
|
<if test="patrolPointName != null and patrolPointName != ''">and a.patrolpoint_name = #{patrolPointName}</if> |
|
|
|
<if test="patrolPointName != null and patrolPointName != ''">and a.patrol_point_name = #{patrolPointName}</if> |
|
|
|
ORDER BY |
|
|
|
a.device_id |
|
|
|
</select> |
|
|
|
|