Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -219,34 +219,39 @@
         </if>
         <if test="id == null">
             union all
-            select
-            'component' as template,
-            true as openStatus,
-            if(sou.id is null,0,1) as isBinding,
-            if(vid.code is null,vid.name,concat(vid.name,'(',vid.code,')')) as displayName,
-            '{\"width\": 42, \"height\": 42}'as initStyle,
-            'CommonEquip' as componentName,
-            vid.id as sequenceNbr,
-            'equipment' as componentKey,
-            'video' as `key`,
-            img as imgPath,
-            vid.code as equipCode,
-            vis.source_id as parentId,
-            vid.id as equipId,
-            vid.code as categoryCode,
-            vid.name as equipName,
-            '' as equipSyetemId,
-            '' as iotCode,
-            '1000000000000000'as groupId,
-            '监控摄像' as groupName,
-            url as ip ,
+            SELECT
+            'component' AS template,
+            TRUE AS openStatus,
+            IF
+            (
+            ( SELECT ss.id FROM wl_source_scene ss WHERE ss.video_in_scene LIKE CONCAT( '%', vid.id, '%' ) ) IS NULL,
+            0,
+            1
+            ) AS isBinding,
+            IF
+            ( vid.CODE IS NULL, vid.NAME, concat( vid.NAME, '(', vid.CODE, ')' ) ) AS displayName,
+            '{\"width\": 42, \"height\": 42}' AS initStyle,
+            'CommonEquip' AS componentName,
+            vid.id AS sequenceNbr,
+            'equipment' AS componentKey,
+            'video' AS `key`,
+            img AS imgPath,
+            vid.CODE AS equipCode,
+            vis.source_id AS parentId,
+            vid.id AS equipId,
+            vid.CODE AS categoryCode,
+            vid.NAME AS equipName,
+            '' AS equipSyetemId,
+            '' AS iotCode,
+            '1000000000000000' AS groupId,
+            '监控摄像' AS groupName,
+            url AS ip,
             token,
-            stru.full_name as address
-            from
-            wl_video as vid
-            join wl_video_source as vis on vid.id = vis.video_id
-            join wl_source_scene as sou on sou.video_in_scene like CONCAT('%',vid.id ,'%' )
-            join wl_warehouse_structure as stru on stru.id = sou.source_id
+            stru.full_name AS address
+            FROM
+            wl_video AS vid
+            JOIN wl_video_source AS vis ON vid.id = vis.video_id
+            JOIN wl_warehouse_structure AS stru ON stru.id = vis.source_id
         </if>
     </select>
     <select id="get3dPointData" resultType="com.yeejoin.equipmanage.common.entity.vo.PointTreeVo">