修改三维数据查询接口

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -1540,16 +1540,16 @@
 		)
 		END positionDTO,
 		vi.name as label,
-		sou.name as protectObjName,
+		ws.name as protectObjName,
 		'' as routeName,
 		'' as person,
 		vi.name as title,
 		concat('video-',vi.id) as `key`,
 		vis.source_id as riskSourceId,
-		sou.name as room
+		CONCAT(ws.full_name,vi.address) AS room
 		from wl_video as vi
 		left join wl_video_source as vis on vi.id = vis.video_id
-		left join f_risk_source as sou on sou.id = vis.source_id
+		LEFT JOIN wl_warehouse_structure AS ws ON ws.id = vis.source_id
 		where vis.source_id is not null
 		group by vi.id
 		UNION all
@@ -1581,7 +1581,7 @@
 		'' as person,
 		det.name as title,
 		concat('hydrant-',spe.id) as `key`,
-		risk.id as riskSourceId,
+		str.source_id as riskSourceId,
 		str.full_name as room
 		from
 		wl_equipment_specific as spe
@@ -1590,8 +1590,7 @@
 		left join wl_equipment_category as cat on equ.category_id = cat.id
 		left join wl_stock_detail as sto on  sto.qr_code = spe.qr_code
 		left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
-		left join f_risk_source as risk on str.source_id = risk.source_id
-		where   substr(cat.code ,1,4)= '3105' and risk.source_id is not null
+		where   substr(cat.code ,1,4)= '3105' and str.source_id is not null
 		UNION all
 		select
 		concat('pool-',s.instanceId) as id,
@@ -1636,9 +1635,8 @@
 		FROM
 		`wl_form_instance` a where a.group_code in('pool','r_pool')
 		GROUP BY
-		a.instance_id) s,
-		f_risk_source r
-		where s.instanceId = r.source_id
+		a.instance_id) s
+		LEFT JOIN f_risk_source r ON s.instanceId = r.source_id
 		UNION all
 		select concat('fireCar-',car.id) as id,concat(car.id) as originId,car.name,car.car_num as code,null as ue4Location,null as ue4Rotation, 'fireCar' as type,car.org_code as orgCode,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'消防车' as typeName,'fireEquipment' as typeCode,