Commit 29e4df0d authored by zhengjiangtao's avatar zhengjiangtao

添加返回字段originId

parent 02cac15c
...@@ -1233,7 +1233,7 @@ ...@@ -1233,7 +1233,7 @@
<select id="retrieveAll" resultType="java.util.HashMap"> <select id="retrieveAll" resultType="java.util.HashMap">
select *,'{ "x": 0, "y": 0, "z": 0 }' rotationDTO,'{ "x": 1, "y": 1, "z": 1 }' scaleDTO select *,'{ "x": 0, "y": 0, "z": 0 }' rotationDTO,'{ "x": 1, "y": 1, "z": 1 }' scaleDTO
from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4Location,r.ue4_rotation as ue4Rotation ,'riskSource' as type,r.org_code as orgCode, from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue4_location as ue4Location,r.ue4_rotation as ue4Rotation ,'riskSource' as type,r.org_code as orgCode,
rl.level as level,rl.name as levelStr,r.is_indoor as isIndoor,'风险点' as typeName,'riskSource' as typeCode, rl.level as level,rl.name as levelStr,r.is_indoor as isIndoor,'风险点' as typeName,'riskSource' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1268,7 +1268,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1268,7 +1268,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
AND rl.level = #{dataLevel} AND rl.level = #{dataLevel}
</if> </if>
UNION all UNION all
select concat('patrol-',p.id) as id,p.name,p.point_no as code,p.ue4_location as ue4Location,p.ue4_rotation as ue4Rotation ,'patrol' as type,p.org_code as orgCode, select concat('patrol-',p.id) as id,p.id as originId,p.name,p.point_no as code,p.ue4_location as ue4Location,p.ue4_rotation as ue4Rotation ,'patrol' as type,p.org_code as orgCode,
p.status as level,CONCAT('level_',p.status) as levelStr,p.is_indoor as isIndoor,'巡检点' as typeName,'patrol' as typeCode, p.status as level,CONCAT('level_',p.status) as levelStr,p.is_indoor as isIndoor,'巡检点' as typeName,'patrol' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1304,7 +1304,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1304,7 +1304,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
from p_point p from p_point p
WHERE is_delete = FALSE WHERE is_delete = FALSE
UNION all UNION all
select concat('impEquipment-',id) as id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation ,'impEquipment' as type,org_code as orgCode, select concat('impEquipment-',id) as id,id as originId,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation ,'impEquipment' as type,org_code as orgCode,
0 as level,'level_0' as levelStr,e.is_indoor as isIndoor,'重点设备' as typeName,'impEquipment' as typeCode, 0 as level,'level_0' as levelStr,e.is_indoor as isIndoor,'重点设备' as typeName,'impEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1334,7 +1334,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1334,7 +1334,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
concat('impEquipment-',e.id) as `key` concat('impEquipment-',e.id) as `key`
from f_equipment e from f_equipment e
UNION all UNION all
select concat('monitorEquipment-',m.id) as id,m.name,m.code,m.ue4_location as ue4Location,m.ue4_rotation as ue4Rotation ,'monitorEquipment' as type,m.org_code as orgCode, select concat('monitorEquipment-',m.id) as id,m.id as originId,m.name,m.code,m.ue4_location as ue4Location,m.ue4_rotation as ue4Rotation ,'monitorEquipment' as type,m.org_code as orgCode,
m.equip_status as level , concat('level_',m.equip_status) as levelStr,m.is_indoor as isIndoor,'探测器' as typeName,'monitorEquipment' as typeCode, m.equip_status as level , concat('level_',m.equip_status) as levelStr,m.is_indoor as isIndoor,'探测器' as typeName,'monitorEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1371,7 +1371,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1371,7 +1371,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
AND f.name = #{protectObjName} AND f.name = #{protectObjName}
</if> </if>
UNION all UNION all
select concat('video-',m.id) as id,m.name,m.code,m.ue4_location as ue4Location,m.ue4_rotation as ue4Rotation ,'video' as type,m.org_code as orgCode, select concat('video-',m.id) as id,m.id as originId,m.name,m.code,m.ue4_location as ue4Location,m.ue4_rotation as ue4Rotation ,'video' as type,m.org_code as orgCode,
m.equip_status as level , concat('level_',m.equip_status) as levelStr,m.is_indoor as isIndoor,'摄像头' as typeName,'video' as typeCode, m.equip_status as level , concat('level_',m.equip_status) as levelStr,m.is_indoor as isIndoor,'摄像头' as typeName,'video' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1405,7 +1405,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1405,7 +1405,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
where m.equip_classify = 2 where m.equip_classify = 2
UNION all UNION all
select concat('hydrant-',id) as id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation ,'hydrant' as type,org_code as orgCode, select concat('hydrant-',id) as id,id as originId,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation ,'hydrant' as type,org_code as orgCode,
0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'消防栓' as typeName,'fireEquipment' as typeCode, 0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'消防栓' as typeName,'fireEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1435,7 +1435,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1435,7 +1435,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
concat('hydrant-',id) as `key` concat('hydrant-',id) as `key`
from f_water_resource where type = 1 from f_water_resource where type = 1
UNION all UNION all
select concat('pool-',id) as id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,'pool' as type,org_code as orgCode, select concat('pool-',id) as id,id as originId,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,'pool' as type,org_code as orgCode,
0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'消防水池' as typeName,'fireEquipment' as typeCode, 0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'消防水池' as typeName,'fireEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1465,7 +1465,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1465,7 +1465,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
concat('pool-',id) as `key` concat('pool-',id) as `key`
from f_water_resource where type = 2 from f_water_resource where type = 2
UNION all UNION all
select concat('fireCar-',id) as id,name,car_num as code,ue4_location as ue4Location,ue4_rotation as ue4Rotation, 'fireCar' as type,org_code as orgCode, select concat('fireCar-',id) as id,id as originId,name,car_num as code,ue4_location as ue4Location,ue4_rotation as ue4Rotation, 'fireCar' as type,org_code as orgCode,
0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'消防车' as typeName,'fireEquipment' as typeCode, 0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'消防车' as typeName,'fireEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1495,7 +1495,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1495,7 +1495,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
concat('fireCar-',id) as `key` concat('fireCar-',id) as `key`
from f_fire_car from f_fire_car
UNION all UNION all
select concat('fireEquipment-',id) as id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,'fireEquipment' as type,org_code as orgCode, select concat('fireEquipment-',id) as id,id as originId,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation,'fireEquipment' as type,org_code as orgCode,
equip_status as level , concat('level_',equip_status) as levelStr,is_indoor as isIndoor,'灭火器' as typeName,'fireEquipment' as typeCode, equip_status as level , concat('level_',equip_status) as levelStr,is_indoor as isIndoor,'灭火器' as typeName,'fireEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1525,7 +1525,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1525,7 +1525,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
concat('fireEquipment-',id) as `key` concat('fireEquipment-',id) as `key`
from f_fire_equipment where equip_classify = 3 from f_fire_equipment where equip_classify = 3
UNION all UNION all
select concat('fireChamber-',id) as id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation , 'fireChamber' as type,org_code as orgCode, select concat('fireChamber-',id) as id,id as originId,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation , 'fireChamber' as type,org_code as orgCode,
0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'泡沫间' as typeName,'fireEquipment' as typeCode, 0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'泡沫间' as typeName,'fireEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1555,7 +1555,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4 ...@@ -1555,7 +1555,7 @@ from (select concat('riskSource',r.id) as id,r.name,r.code,r.ue4_location as ue4
concat('fireChamber-',id) as `key` concat('fireChamber-',id) as `key`
from f_fire_station where type = 2 from f_fire_station where type = 2
UNION all UNION all
select concat('fireFoamRoom-',id) as id,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation ,'fireFoamRoom' as type,org_code as orgCode, select concat('fireFoamRoom-',id) as id,id as originId,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation ,'fireFoamRoom' as type,org_code as orgCode,
0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'消防室' as typeName,'fireEquipment' as typeCode, 0 as level , 'level_0' as levelStr,is_indoor as isIndoor,'消防室' as typeName,'fireEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
......
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