Commit 4f95d864 authored by suhuiguang's avatar suhuiguang

1.类型点详情接口返回增加字段:闪烁频率、是否显示顶牌、顶牌内容字段,用已控制3维顶牌及闪烁

parent 939574db
...@@ -204,7 +204,10 @@ ...@@ -204,7 +204,10 @@
<choose> <choose>
<when test="type == 'riskSource'"> <when test="type == 'riskSource'">
select rs.id,rs.name,rs.code,rs.ue4_location as ue4Location,rs.ue4_rotation as ue4Rotation,rs.position3d, select rs.id,rs.name,rs.code,rs.ue4_location as ue4Location,rs.ue4_rotation as ue4Rotation,rs.position3d,
rl.level,rl.name as levelStr,rs.floor3d ,rs.is_indoor as isIndoor rl.level,rl.name as levelStr,rs.floor3d ,rs.is_indoor as isIndoor,
rs.flicker_frequency as frequency,
true as 'showInfo',
rs.rpn as title
from f_risk_source rs from f_risk_source rs
left join f_risk_level rl ON rl.id = rs.risk_level_id left join f_risk_level rl ON rl.id = rs.risk_level_id
where 1=1 where 1=1
...@@ -217,8 +220,27 @@ ...@@ -217,8 +220,27 @@
</when> </when>
<when test="type == 'patrol'"> <when test="type == 'patrol'">
select id,name,point_no as code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,coordinates as position3d, select id,name,point_no as code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,coordinates as position3d,
status,floor as floor3d,is_indoor as isIndoor status,floor as floor3d,is_indoor as isIndoor,
from p_point 0 as frequency,
case p.status
when '0' then false
when '1' then false
else true
end as `showInfo`,
case p.status
when '0' then '未计划'
when '1' then '合格'
when '2' then '不合格'
when '3' then '漏检'
end as title,
case p.status
when '0' then '未计划'
when '1' then '合格'
when '2' then '不合格'
when '3' then '漏检'
end as levelStr,
status as level
from p_point p
where 1=1 and is_delete = 0 where 1=1 and is_delete = 0
<if test="pointId != null"> <if test="pointId != null">
AND id = #{pointId} AND id = #{pointId}
...@@ -229,7 +251,10 @@ ...@@ -229,7 +251,10 @@
</when> </when>
<when test="type == 'impEquipment'"> <when test="type == 'impEquipment'">
select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
false as 'showInfo',
name as 'title'
from f_equipment from f_equipment
where 1=1 where 1=1
<if test="pointId != null"> <if test="pointId != null">
...@@ -241,7 +266,10 @@ ...@@ -241,7 +266,10 @@
</when> </when>
<when test="type == 'monitorEquipment'"> <when test="type == 'monitorEquipment'">
select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
false as 'showInfo',
name as 'title'
from f_fire_equipment from f_fire_equipment
where equip_classify = 0 where equip_classify = 0
<if test="pointId != null"> <if test="pointId != null">
...@@ -253,7 +281,10 @@ ...@@ -253,7 +281,10 @@
</when> </when>
<when test="type == 'video'"> <when test="type == 'video'">
select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
false as 'showInfo',
name as 'title'
from f_fire_equipment from f_fire_equipment
where equip_classify = 2 where equip_classify = 2
<if test="pointId != null"> <if test="pointId != null">
...@@ -265,7 +296,10 @@ ...@@ -265,7 +296,10 @@
</when> </when>
<when test="type == 'hydrant'"> <when test="type == 'hydrant'">
select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
false as 'showInfo',
name as 'title'
from f_water_resource from f_water_resource
where type = 1 where type = 1
<if test="pointId != null"> <if test="pointId != null">
...@@ -277,7 +311,10 @@ ...@@ -277,7 +311,10 @@
</when> </when>
<when test="type == 'pool'"> <when test="type == 'pool'">
select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
false as 'showInfo',
name as 'title'
from f_water_resource from f_water_resource
where type = 2 where type = 2
<if test="pointId != null"> <if test="pointId != null">
...@@ -289,7 +326,10 @@ ...@@ -289,7 +326,10 @@
</when> </when>
<when test="type == 'fireCar'"> <when test="type == 'fireCar'">
select id,name,car_num as code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,car_num as code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
true as 'showInfo',
name as 'title'
from f_fire_car from f_fire_car
where 1=1 where 1=1
<if test="pointId != null"> <if test="pointId != null">
...@@ -301,7 +341,10 @@ ...@@ -301,7 +341,10 @@
</when> </when>
<when test="type == 'fireEquipment'"> <when test="type == 'fireEquipment'">
select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
true as 'showInfo',
name as 'title'
from f_fire_equipment from f_fire_equipment
where equip_classify = 3 where equip_classify = 3
<if test="pointId != null"> <if test="pointId != null">
...@@ -313,7 +356,10 @@ ...@@ -313,7 +356,10 @@
</when> </when>
<when test="type == 'fireChamber'"> <when test="type == 'fireChamber'">
select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
true as 'showInfo',
name as 'title'
from f_fire_station from f_fire_station
where type = 1 where type = 1
<if test="pointId != null"> <if test="pointId != null">
...@@ -325,7 +371,10 @@ ...@@ -325,7 +371,10 @@
</when> </when>
<when test="type == 'fireFoamRoom'"> <when test="type == 'fireFoamRoom'">
select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d, select id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,position3d,
floor3d,is_indoor as isIndoor floor3d,is_indoor as isIndoor,
0 as frequency,
true as 'showInfo',
name as 'title'
from f_fire_station from f_fire_station
where type = 2 where type = 2
<if test="pointId != null"> <if test="pointId != null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment