1.修改过滤positon

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

@@ -1386,47 +1386,49 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
 		LIMIT ${start},${length}
 	</select>
 	<select id="getAllPointInRegions" resultType="java.util.Map">
-       select
+		select
 		CONCAT(type,'-',id) as `key`,
 		id as pointId,
 		name,
 		type,
-		risk_source_id as regionId
+		risk_source_id as regionId,
+		position3d
 		from
-		(select id,name,'riskSource' as type, parent_id as risk_source_id
+		(select id,name,'riskSource' as type, parent_id as risk_source_id,position3d
 		from f_risk_source where is_region = 'FALSE'
 		UNION all
-		select id,name,'patrol' as type,risk_source_id
+		select id,name,'patrol' as type,risk_source_id,coordinates as position3d
 		from p_point WHERE is_delete = FALSE
 		UNION all
-		select id,name ,'impEquipment' as type,risk_source_id
+		select id,name ,'impEquipment' as type,risk_source_id,position3d
 		from f_equipment e
 		UNION all
-		select id,name,'monitorEquipment' as type,risk_source_id
+		select id,name,'monitorEquipment' as type,risk_source_id,position3d
 		from f_fire_equipment where  equip_classify = 0
 		UNION all
-		select id,name,'video' as type,risk_source_id
+		select id,name,'video' as type,risk_source_id,position3d
 		from f_fire_equipment where  equip_classify = 2
 		UNION all
-		select id,name ,'hydrant' as type,risk_source_id
+		select id,name ,'hydrant' as type,risk_source_id,position3d
 		from f_water_resource  where type = 1
 		UNION all
-		select id,name,'pool' as type,risk_source_id
+		select id,name,'pool' as type,risk_source_id,position3d
 		from f_water_resource  where type = 2
 		UNION all
-		select id,name,'fireCar' as type,risk_source_id
+		select id,name,'fireCar' as type,risk_source_id,position3d
 		from f_fire_car
 		UNION all
-		select id,name,'fireEquipment' as type,risk_source_id
+		select id,name,'fireEquipment' as type,risk_source_id,position3d
 		from f_fire_equipment where  equip_classify = 3
 		UNION all
-		select id,name,'fireChamber' as type,risk_source_id
+		select id,name,'fireChamber' as type,risk_source_id,position3d
 		from f_fire_station where type = 2
 		UNION all
-		select id,name,'fireFoamRoom' as type,risk_source_id
+		select id,name,'fireFoamRoom' as type,risk_source_id,position3d
 		from f_fire_station where type = 1
 		) as sp
 		where
+		position3d  <![CDATA[<>]]> '' and 
 		risk_source_id in
 		<foreach collection="ids" open="(" separator="," close=")" item="id">
 			#{id}