|
|
@@ -3,6 +3,7 @@
|
|
|
<mapper namespace="com.huaxu.dao.DeviceMapper">
|
|
|
|
|
|
<sql id="Base_Column_List">
|
|
|
+ distinct
|
|
|
d.id
|
|
|
,d.TENANT_ID as "tenantId"
|
|
|
,d.DEVICE_CODE as "deviceCode"
|
|
|
@@ -173,6 +174,8 @@
|
|
|
,t.MANUFACTURER_ID as "manufacturerId"
|
|
|
,t.DEVICE_TYPE as "deviceType"
|
|
|
,t.DEVICE_MODE as "deviceMode"
|
|
|
+ ,s.PARENT_SCENE_ID as "parentSceneId"
|
|
|
+ ,s.SCENE_ID as "sceneId"
|
|
|
,case when s.ID is null then 0 else 1 end as "isCheck"
|
|
|
from sms_device d
|
|
|
left join sms_device_type t on d.DEVICE_TYPE_ID = t.id
|
|
|
@@ -319,6 +322,8 @@
|
|
|
<select id="selectPage" resultType="com.huaxu.dto.DeviceDto">
|
|
|
select
|
|
|
<include refid="Base_Column_List"/>
|
|
|
+ ,s.PARENT_SCENE_ID as "parentSceneId"
|
|
|
+ ,s.SCENE_ID as "sceneId"
|
|
|
from sms_device d
|
|
|
left join sms_device_type t on d.DEVICE_TYPE_ID = t.id
|
|
|
<if test="deviceDto.sceneId!= null and deviceDto.sceneId != 0 ">
|
wangli