摄像头场景树

sms_water/src/main/java/com/huaxu/dao/CameraManageMapper.java

@@ -84,4 +84,7 @@ public interface CameraManageMapper {
     int deleteAll(List<Integer> ids);
 
     List<CameraManage> getAllCameras(Integer id);
+
+    List<CameraManage> selectAllCameras(CameraManage searchCameraManage);
+
 }

sms_water/src/main/java/com/huaxu/entity/CameraManage.java

@@ -151,6 +151,7 @@ public class CameraManage implements Serializable {
     @ApiModelProperty(value = "权限类型",hidden = true)
     @TableField(exist = false)
     private Integer permissonType;
+    private String parentSceneIds;
 
 
 }

sms_water/src/main/java/com/huaxu/service/impl/CameraManageServiceImpl.java

@@ -311,10 +311,12 @@ public class CameraManageServiceImpl implements CameraManageService {
         searchSceneEntity.setUserType(currentUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         searchSceneEntity.setPermissonType(currentUser.getPermissonType());
+        searchSceneEntity.setParentSceneId(0l);
         List<SceneEntity> sceneEntities = sceneMapper.findList(searchSceneEntity);
         CameraManage searchCameraManage=new CameraManage();
         searchCameraManage.setStatus(1);
-        List<CameraManage> cameraManages = cameraManageMapper.selectList(searchCameraManage);
+        searchCameraManage.setTenantId(currentUser.getTenantId());
+        List<CameraManage> cameraManages = cameraManageMapper.selectAllCameras(searchCameraManage);
         List<CameraDto>cameraDtos=new ArrayList<>();
         sceneEntities.forEach(sceneEntity -> {
                 CameraDto cameraDto=new CameraDto();
@@ -331,8 +333,10 @@ public class CameraManageServiceImpl implements CameraManageService {
 
             cameraDto.setId(Long.valueOf(cameraManage.getId()) );
             cameraDto.setKey(cameraManage.getId()+"_cameraType");
-            cameraDto.setParentKey(cameraManage.getSceneId()+"_senceType");
-
+            String[] parentIds = cameraManage.getParentSceneIds().split(",");
+            if(parentIds.length>1){
+                cameraDto.setParentKey(parentIds[1]+"_senceType");
+            }
             cameraDto.setSceneName(cameraManage.getName());
             cameraDtos.add(cameraDto);
         } );

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

@@ -357,6 +357,13 @@
                     FIND_IN_SET( DATA.id, ID._ids )
             )
     </select>
+    <select id="selectAllCameras" resultType="com.huaxu.entity.CameraManage">
+        select
+        <include refid="Base_Column_List"/> ,b.SCENE_NAME,b.PARENT_SCENE_IDS
+        from sms_camera_manage a join sms_scene b on a.SCENE_ID=b.ID
+        where a.status=1  and a.TENANT_ID = #{tenantId}
+    </select>
+
     <update id="deleteAll">
         update sms_camera_manage set STATUS=0 where STATUS=1 and ID in
         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">