|
@@ -279,7 +279,7 @@
|
|
|
</select>
|
|
|
<!--分页查询实时数据列表-->
|
|
|
<select id="selectPage" resultType="com.huaxu.dto.OnlineDataDto">
|
|
|
- select t1.id scene_id,t1.scene_name,t1.address
|
|
|
+ select t1.id scene_id,t1.scene_name,t1.address,t3.scene_type_name
|
|
|
from sms_scene t1
|
|
|
inner join sms_scene_type t3 on t3.id = t1.scene_type_id and t3. status = 1
|
|
|
left join(
|
|
@@ -701,7 +701,7 @@
|
|
|
</select>
|
|
|
<!--查询实时数据列表-->
|
|
|
<select id="selectList" resultType="com.huaxu.dto.OnlineDataDto">
|
|
|
- select t1.id scene_id,t1.scene_name,t1.address
|
|
|
+ select t1.id scene_id,t1.scene_name,t1.address,t3.scene_type_name
|
|
|
,case when t7.offline_alarm_count=t10.setting_device_count then 2
|
|
|
when t7.alarm_count>0 or t7.offline_alarm_count>0 then 1 else 0 end scene_state
|
|
|
from sms_scene t1
|