|
|
@@ -245,7 +245,7 @@
|
|
|
select a.DEVICE_ID as "deviceId",b.DEVICE_CODE as "deviceCode",a.ATTRIBUTE_ID as "attributeId"
|
|
|
from sms_device_parm a
|
|
|
inner join sms_device b on a.DEVICE_ID=b.id
|
|
|
- where a.PARM_TYPE=#{info.parmType}
|
|
|
+ where a.PARM_TYPE=#{info.parmType} and b.`STATUS`=1
|
|
|
and a.PARENT_SCENE_ID in
|
|
|
<foreach collection="info.sceneEntities" item="dramaId" open="(" close=")" separator=",">
|
|
|
#{dramaId.id}
|
|
|
@@ -255,7 +255,7 @@
|
|
|
select b.PARM_TYPE as "parmType",count(a.DEVICE_ID) as "totalCount",count(c.id) as "nbnormalCount"
|
|
|
from sms_device_scene a
|
|
|
INNER JOIN sms_device_parm b on a.DEVICE_ID=b.DEVICE_ID
|
|
|
- and a.PARENT_SCENE_ID=b.PARENT_SCENE_ID and b.PARM_TYPE in (7,9,11,15)
|
|
|
+ and a.PARENT_SCENE_ID=b.PARENT_SCENE_ID and b.PARM_TYPE in (7,9,11,15) and b.`STATUS`=1
|
|
|
LEFT JOIN sms_alarm_details c on c.PARENT_SCENE_ID=b.PARENT_SCENE_ID
|
|
|
and c.ATTRIBUTE_ID=b.ATTRIBUTE_ID and c.STATE=1
|
|
|
where a.PARENT_SCENE_ID in
|
wangyangyang