Merge branch 'CSFAS_V3.0.1.5' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into CSFAS_V3.0.1.5

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

@@ -1991,6 +1991,31 @@
         </where>
         UNION ALL
 		SELECT
+		concat( 'impEquipment-', e.id ) AS id,
+		concat( e.id ) AS originId,
+		e.NAME,
+		e.CODE,
+		'impEquipment' AS type,
+		e.org_code AS orgCode,
+		0 AS LEVEL,
+		'level_0' AS levelStr,
+		e.is_indoor AS isIndoor,
+		'重点设备' AS typeName,
+		'impEquipment' AS typeCode,
+		e.NAME AS label,
+		e.NAME AS protectObjName,
+		'' AS routeName,
+		NULL AS areaId,
+		'' AS person,
+		e.NAME AS title,
+		concat( 'impEquipment-', e.id ) AS `key`,
+		e.risk_source_id AS riskSourceId,
+		r.NAME AS room
+		FROM
+		f_equipment e
+		LEFT JOIN f_risk_source r ON r.id = e.risk_source_id
+		UNION ALL
+        SELECT
         		concat('fireEquipment-', m.id) AS id,
 				concat(m.id) AS originId,
 				det.`name`,
@@ -2173,6 +2198,31 @@
                 AND p.area_id = #{areaId}
             </if>
         </where>
+		UNION all
+		SELECT
+		concat( 'impEquipment-', e.id ) AS id,
+		concat( e.id ) AS originId,
+		e.NAME,
+		e.CODE,
+		'impEquipment' AS type,
+		e.org_code AS orgCode,
+		0 AS LEVEL,
+		'level_0' AS levelStr,
+		e.is_indoor AS isIndoor,
+		'重点设备' AS typeName,
+		'impEquipment' AS typeCode,
+		e.NAME AS label,
+		e.NAME AS protectObjName,
+		'' AS routeName,
+		NULL AS areaId,
+		'' AS person,
+		e.NAME AS title,
+		concat( 'impEquipment-', e.id ) AS `key`,
+		e.risk_source_id AS riskSourceId,
+		r.NAME AS room
+		FROM
+		f_equipment e
+		LEFT JOIN f_risk_source r ON r.id = e.risk_source_id
         UNION ALL
         SELECT
         		concat('fireEquipment-', m.id) AS id,