|
@@ -78,7 +78,7 @@ SELECT
|
|
|
atp.weekdays AS weekdays,
|
|
|
|
|
|
di.dev_name AS dev_name,
|
|
|
- di.tenant_id AS tenant_id -- 租户id
|
|
|
+ di.tenant_id AS tenant_id
|
|
|
|
|
|
FROM alarm_plan ap
|
|
|
LEFT JOIN event_type et
|
|
@@ -86,7 +86,7 @@ LEFT JOIN event_type et
|
|
|
LEFT JOIN alarm_time_plan atp
|
|
|
ON ap.alarm_time_plan_id = atp.id
|
|
|
LEFT JOIN dev_info di
|
|
|
- ON ap.dev_id = di.client_id -- 匹配设备id
|
|
|
+ ON ap.dev_id = di.client_id
|
|
|
WHERE
|
|
|
ap.enable = 1;
|
|
|
"""
|
|
@@ -118,15 +118,15 @@ SELECT
|
|
|
atp.month_days AS month_days,
|
|
|
atp.weekdays AS weekdays,
|
|
|
|
|
|
- di.dev_name AS dev_name -- 设备名称,
|
|
|
- di.tenant_id AS tenant_id -- 租户id
|
|
|
+ di.dev_name AS dev_name,
|
|
|
+ di.tenant_id AS tenant_id
|
|
|
FROM alarm_plan ap
|
|
|
LEFT JOIN event_type et
|
|
|
ON ap.event_val = et.event_val
|
|
|
LEFT JOIN alarm_time_plan atp
|
|
|
ON ap.alarm_time_plan_id = atp.id
|
|
|
LEFT JOIN dev_info di
|
|
|
- ON ap.dev_id = di.client_id -- 匹配设备id
|
|
|
+ ON ap.dev_id = di.client_id
|
|
|
WHERE
|
|
|
ap.enable = 1 AND
|
|
|
ap.uuid = %(plan_uuid)s;
|