|
|
@@ -125,12 +125,11 @@
|
|
|
|
|
|
<select id="alarmList" resultType="com.xunmei.iot.vo.webStatisticBoard.BoardAlarmInfoVo">
|
|
|
SELECT o.short_name AS org_name,
|
|
|
- di.device_name,
|
|
|
+ ad.device_name,
|
|
|
ad.time AS alarmStartTime,
|
|
|
ad.end_time AS alarmEndTime,
|
|
|
ad.value_text AS alarmInfo
|
|
|
FROM iot_alarm_data ad
|
|
|
- INNER JOIN iot_device_info di ON ad.device_id = di.id AND di.deleted = 0
|
|
|
INNER JOIN sys_org o ON ad.org_id = o.id AND o.deleted = 0 AND o.is_lock = 0 AND
|
|
|
o.path LIKE concat((SELECT path FROM sys_org WHERE id = #{orgId}), '%')
|
|
|
ORDER BY time DESC
|
jiawuxian