修改三维查询脚本

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

@@ -2073,19 +2073,19 @@
 			r.`code`,
 			'riskSource' AS type,
 			r.org_code AS orgCode,
-			rl.`level` AS `level`,
+			rl.`level` AS level,
 			rl.`name` AS levelStr,
 			r.is_indoor AS isIndoor,
 			'风险点' AS typeName,
 			'riskSource' AS typeCode,
-			r.`name` AS protectObjName,
 			r.`name`  AS label,
+			r.`name` AS protectObjName,
 			'' AS routeName,
+			'' AS areaId,
 			'' AS person,
 			r.rpn AS title,
 			CONCAT('riskSource-', r.id) AS `key`,
 			r.id AS riskSourceId,
-			'' AS areaId,
 			'' AS room
         FROM
         f_risk_source r
@@ -2111,11 +2111,11 @@
 			vi.`name` AS label,
 			vi.`name` AS protectObjName,
 			'' AS routeName,
+			vi.belongAreaId AS areaId,
 			'' AS person,
 			vi.`name` AS title,
 			concat('video-', vi.id) AS `key`,
 			'' AS riskSourceId,
-			vi.belongAreaId AS areaId,
 			vi.address AS room
 		FROM
 			wl_video AS vi
@@ -2129,17 +2129,18 @@
 		        concat('patrol-', p.id) AS id,
 				concat(p.id) AS originId,
 				p.`name`,
-				p.`name` AS protectObjName,
 				p.point_no AS CODE,
 				'patrol' AS type,
 				p.org_code AS orgCode,
-				p.`status` AS LEVEL,
-				CONCAT('level_', p. STATUS) AS levelStr,
+				p.`status` AS level,
+				CONCAT('level_', p.STATUS) AS levelStr,
 				p.is_indoor AS isIndoor,
 				'巡检点' AS typeName,
 				'patrol' AS typeCode,
 				p.`name` AS label,
+				p.`name` AS protectObjName,
 				p.route_name AS routeName,
+				p.area_id AS areaId,
 				p.charge_person_id AS person,
 				CASE
 			WHEN p.`status` = '0' THEN
@@ -2153,7 +2154,6 @@
 			END AS title,
 			concat('patrol-', p.id) AS `key`,
 			p.risk_source_id AS riskSourceId,
-			p.area_id AS areaId,
 			r.full_name AS room
         FROM
         p_point p
@@ -2169,7 +2169,6 @@
         		concat('fireEquipment-', m.id) AS id,
 				concat(m.id) AS originId,
 				det.`name`,
-				det.`name` AS protectObjName,
 				m.`code` AS `code`,
 				'fireEquipment' AS type,
 				m.org_code AS orgCode,
@@ -2179,12 +2178,13 @@
 				'消防设备' AS typeName,
 				'fireEquipment' AS typeCode,
 				det.`name` AS label,
+				det.`name` AS protectObjName,
 				'' AS routeName,
+				m.area_id AS areaId,
 				'' AS person,
 				det.`name` AS title,
 				concat('fireEquipment-', m.id) AS `key`,
 				risk.id AS riskSourceId,
-				m.area_id AS areaId,
 				str.full_name AS room
         FROM
         wl_equipment_specific m