设备修改

sms_water/src/main/resources/mapper/DeviceMapper.xml

@@ -53,10 +53,14 @@
     <select id="selectList" resultType="com.huaxu.dto.DeviceDto">
         select
         <include refid="Base_Column_List"/>
+        <if test="deviceDto.sceneId!= null and deviceDto.sceneId != 0 ">
+            ,s.PARENT_SCENE_ID as "parentSceneId"
+            ,s.SCENE_ID as "sceneId"
+        </if>
         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 ">
-        inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId}
+            inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId} and s.status=1
         </if>
         where d.status = 1
         <if test="deviceDto.tenantId != null and deviceDto.tenantId != '' ">
@@ -109,12 +113,8 @@
         d.id
         ,d.DEVICE_NAME as "deviceName"
         from sms_device d
-        left join sms_device_scene s on s.DEVICE_ID=d.ID
-        where d.status = 1 and s.status=1
-        <if test="deviceDto.sceneId != null ">
-            and s.SCENE_ID=#{deviceDto.sceneId}
-        </if>
-
+        inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId} and s.status=1
+        where d.status = 1 and d.ENABLE_STATE = 1
         <if test="deviceDto.tenantId != null and deviceDto.tenantId != '' ">
             and d.tenant_id = #{deviceDto.tenantId}
         </if>
@@ -173,12 +173,16 @@
         ,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"
+        <if test="deviceDto.sceneId!= null and deviceDto.sceneId != 0 ">
+            ,s.PARENT_SCENE_ID as "parentSceneId"
+            ,s.SCENE_ID as "sceneId"
+        </if>
         ,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
-        left join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId} and s.status=1
+        <if test="deviceDto.sceneId!= null and deviceDto.sceneId != 0 ">
+            inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId} and s.status=1
+        </if>
         where d.status = 1
         <if test="deviceDto.tenantId != null and deviceDto.tenantId != '' ">
             and d.tenant_id = #{deviceDto.tenantId}
@@ -321,12 +325,14 @@
     <select id="selectPage" resultType="com.huaxu.dto.DeviceDto">
         select
         <include refid="Base_Column_List"/>
+        <if test="deviceDto.sceneId!= null and deviceDto.sceneId != 0 ">
         ,s.PARENT_SCENE_ID as "parentSceneId"
         ,s.SCENE_ID as "sceneId"
+        </if>
         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 ">
-            inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId}
+            inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId} and s.status=1
         </if>
         where d.status = 1
         <if test="deviceDto.tenantId != null and deviceDto.tenantId != '' ">