1.漏提交

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

@@ -135,37 +135,6 @@
         select video_in_scene from wl_source_scene where scene_id =#{id}
     </select>
 
-    <select id="getEquipBySceneId" resultMap="EquiplistBySystemId">
-        SELECT
-                spe.id,
-                det.NAME equipment_name,
-                spe.CODE,
-                wlec.NAME AS category_name
-                FROM
-                wl_equipment_specific AS spe
-                LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
-                LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
-                LEFT JOIN wl_equipment_category AS wlec ON wlec.id = wle.category_id
-                WHERE
-                spe.id in
-                <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
-                    #{item}
-                </foreach>
-    </select>
-    <select id="getVideoBySceneId" resultMap="EquiplistBySystemId">
-            SELECT
-            id,
-            name equipment_name,
-            code,
-            name AS category_name
-            FROM
-            wl_video
-            WHERE
-            id in
-            <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
-                #{item}
-            </foreach>
-    </select>
     <select id="getScenesList" resultType="com.yeejoin.equipmanage.common.entity.SourceScene">
         select
         ins.instance_id as id,

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

@@ -1482,4 +1482,18 @@
 			f_station_info
 		LIMIT 1
     </select>
+    <select id="getListByWarehouseStructureId"
+            resultType="com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO">
+            SELECT
+              spe.id,
+              spe.name equipment_name,
+              spe.code,
+              wlec.name AS category_name
+            FROM
+              wl_equipment_specific AS spe
+            LEFT JOIN wl_equipment AS wle ON spe.equipment_code = wle.code
+            LEFT JOIN wl_equipment_category AS wlec ON wlec.id = wle.category_id
+            WHERE
+              spe.warehouse_structure_id =#{floorId}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -377,6 +377,16 @@
         wl_video as wlv
         where wlv.code = #{code}
     </select>
-
-
+    <select id="selectListBySourceId" resultType="com.yeejoin.equipmanage.common.entity.Video">
+        select
+            v.id,
+            v.code,
+            v.name,
+            v.type
+        from
+            wl_video v,
+            wl_video_source vs
+            where vs.source_id = #{floorId}
+            and vs.video_id = v.id
+    </select>
 </mapper>