消防水池优化

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -2493,7 +2493,13 @@
         ou.`code`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
-        avg( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN IFNULL( ei.`value`, 0 ) END ) AS nowLevel,
+        (select
+        avg(IFNULL(ei.`value`,0))
+        from
+        wl_equipment_specific_index ei
+        where
+        (ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel')
+        and  FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS nowLevel,
         IFNULL( rp.volume, 0 ) AS volume,
         ec.image,
         r.resource_type,
@@ -2505,7 +2511,6 @@
         LEFT JOIN cb_org_usr ou ON ou.biz_org_code = r.biz_org_code
         AND ou.is_delete = 0
         LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
-        LEFT JOIN wl_equipment_specific_index ei ON FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id ) > 0
         LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
         LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
         WHERE
@@ -2970,11 +2975,16 @@
         SELECT
         ifnull( `rp`.`min_water_level`, 0 ) AS `minLevel`,
         ifnull( `rp`.`max_water_level`, 0 ) AS `maxLevel`,
-        IFNULL(avg( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN IFNULL( ei.`value`, 0 ) END ),0) AS nowLevel
+        (select
+        avg(IFNULL(ei.`value`,0))
+        from
+        wl_equipment_specific_index ei
+        where
+        (ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel')
+        and  FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS nowLevel
         FROM
         `cb_water_resource` `r`
         LEFT JOIN `cb_water_resource_pool` `rp` ON `rp`.`resource_id` = `r`.`sequence_nbr`
-        LEFT JOIN `wl_equipment_specific_index` `ei` ON FIND_IN_SET(`ei`.`equipment_specific_id`,`rp`.`level_device_id`)
         WHERE
         `r`.`is_delete` = 1
         <if test="bizOrgCode != null and bizOrgCode != ''">
@@ -4655,7 +4665,13 @@
         ou.`code`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
-        avg( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel'  or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN IFNULL( ei.`value`, 0 ) END ) AS nowLevel,
+        (select
+        avg(IFNULL(ei.`value`,0))
+        from
+        wl_equipment_specific_index ei
+        where
+        (ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel')
+        and  FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS nowLevel,
         IFNULL( rp.volume, 0 ) AS volume,
         ec.image,
         r.resource_type,
@@ -4667,7 +4683,6 @@
         LEFT JOIN cb_org_usr ou ON ou.biz_org_code = r.biz_org_code
         AND ou.is_delete = 0
         LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
-        LEFT JOIN wl_equipment_specific_index ei ON FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id ) > 0
         LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
         LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
         WHERE
@@ -4808,14 +4823,19 @@
                     r.`name`,
                     IFNULL( rp.min_water_level, 0 ) AS minLevel,
                     IFNULL( rp.max_water_level, 0 ) AS maxLevel,
-                    max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel'  or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) AS nowLevel,
+                    (select
+                         avg(IFNULL(ei.`value`,0))
+                     from
+                         wl_equipment_specific_index ei
+                     where
+                         (ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel')
+                       and  FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS nowLevel,
                     ec.image,
                     r.resource_type AS type,
                     r.sequence_nbr AS id
                 FROM
                     cb_water_resource r
                         LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
-                        LEFT JOIN wl_equipment_specific_index ei ON ei.equipment_specific_id = rp.level_device_id
                         LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
                 WHERE
                     r.resource_type = 'waterTank'