消防水池逻辑修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourcePoolDto.java

@@ -69,7 +69,7 @@ public class WaterResourcePoolDto  extends BaseDto {
    private float maxWaterLevel;
 
    @ApiModelProperty("水池液位显示装置id")
-   private Long levelDeviceId;
+   private String levelDeviceId;
 
    @ApiModelProperty("水池液位显示装置名称")
    private String levelDeviceName;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java

@@ -104,7 +104,7 @@ public class WaterResourcePool extends BaseEntity {
      * 水池液位显示装置id
      */
     @TableField("level_device_id")
-    private Long levelDeviceId;
+    private String levelDeviceId;
 
     /**
      * 水池液位显示装置名称

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -453,11 +453,18 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
     List<Map<String, Object>> getSystemAlarmInfoNum(@Param("bizOrgCode") String bizOrgCode);
 
     /**
-     * 消防水池或者工业水池信息
+     * 工业水池信息
      * @param bizOrgCode
      * @return
      */
-    List<Map<String, Object>> getWaterPoolInfoNum(@Param("bizOrgCode") String bizOrgCode, @Param("poolType") String poolType);
+    List<Map<String, Object>> getWaterIndustryPoolInfoNum(@Param("bizOrgCode") String bizOrgCode);
+
+    /**
+     * 消防水池信息
+     * @param bizOrgCode
+     * @return
+     */
+    List<Map<String, Object>> getWaterPoolInfoNum(@Param("bizOrgCode") String bizOrgCode);
 
     /**
      * 消防水源总量统计

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -1459,8 +1459,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         List<Map<String, Object>> carInfo = fireFightingSystemMapper.getCarInfo(bizOrgCode);
         bigScreenVo.setCarNumInfo(carInfo);
         List<Map<String, Object>> systemAlarmInfoNum = fireFightingSystemMapper.getSystemAlarmInfoNum(bizOrgCode);
-        List<Map<String, Object>> pool = fireFightingSystemMapper.getWaterPoolInfoNum(bizOrgCode, "pool");
-        List<Map<String, Object>> industryPool = fireFightingSystemMapper.getWaterPoolInfoNum(bizOrgCode, "industryPool");
+        List<Map<String, Object>> pool = fireFightingSystemMapper.getWaterPoolInfoNum(bizOrgCode);
+        List<Map<String, Object>> industryPool = fireFightingSystemMapper.getWaterIndustryPoolInfoNum(bizOrgCode);
         bigScreenVo.setSystemAlarmInfoNum(systemAlarmInfoNum);
         bigScreenVo.setIndustryPool(industryPool);
         bigScreenVo.setPool(pool);

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -193,4 +193,15 @@
             INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000319', 'address', '地址', 'String', '132828674817', 'eq', b'0', 'r_fireControlRoom', '2581805', '2022-03-01 12:01:04');
         </sql>
     </changeSet>
+
+
+    <changeSet author="zs" id="202210101651">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_water_resource_pool"/>
+        </preConditions>
+        <comment>修改液位显示装置字段类型->需求2022 一个水池可选多个 装置</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool` MODIFY COLUMN `level_device_id` varchar(255) NULL DEFAULT NULL COMMENT '水池液位显示装置id';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -2362,7 +2362,8 @@
     </select>
 
     <select id="getWaterInfo" resultType="java.util.Map">
-        SELECT
+        select * from (
+        (SELECT
         r.`name`,
         ou.`code`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
@@ -2418,13 +2419,97 @@
         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 es ON es.id = rp.level_device_id
-        LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
         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
         LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
         WHERE
-        r.resource_type IN ( 'pool', 'industryPool' )
+        r.resource_type = 'industryPool'
+        AND r.is_delete = 1
+        AND ou.`code` IS NOT NULL
+        <if test="bizOrgCode!=null and bizOrgCode!=''">
+            AND r.biz_org_code like concat(#{bizOrgCode}, '%')
+        </if>
+        <if test="systemCode!=null and systemCode!=''">
+            AND fs.code = #{systemCode,jdbcType=VARCHAR}
+        </if>
+        GROUP BY
+        r.sequence_nbr) union all
+        (
+        SELECT
+        a.`name`,
+        a.`code`,
+        a.minLevel,
+        a.maxLevel,
+        (
+        CASE
+
+        WHEN a.nowLevel IS NULL THEN
+        '--'
+        WHEN a.nowLevel >= IFNULL( a.minLevel, 0 )
+        AND a.maxLevel IS NULL THEN
+        '100'
+        WHEN IFNULL( a.minLevel, 0 ) > a.nowLevel
+        AND a.maxLevel IS NULL THEN
+        '--' ELSE IFNULL((
+        FORMAT(
+        abs(
+        IFNULL(
+        a.nowLevel,
+        IFNULL( a.minLevel, 0 )) /
+        IF
+        (
+        IFNULL( a.maxLevel, 0 ) = 0,
+        1,
+        IFNULL( a.maxLevel, 0 ))) * 100,
+        2
+        )
+        ),
+        0
+        )
+        END
+        ) AS levelAbs,
+        a.nowLevel,
+        (
+        CASE
+
+        WHEN a.nowLevel IS NULL
+        OR a.minLevel IS NULL THEN
+        '--'
+        WHEN IFNULL( a.minLevel, 0 ) > IFNULL(
+        a.nowLevel,
+        IFNULL( a.minLevel, 0 )) THEN
+        '缺水' ELSE '正常'
+        END
+        ) AS levelStatus,
+        a.volume,
+        a.image,
+        a.resource_type,
+        a.sequence_nbr,
+        a.`code` AS systemCode
+        FROM
+        (
+        SELECT
+        r.`name`,
+        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' THEN IFNULL( ei.`value`, 0 ) END ) AS nowLevel,
+        IFNULL( rp.volume, 0 ) AS volume,
+        ec.image,
+        r.resource_type,
+        r.sequence_nbr,
+        rp.level_device_id,
+        fs.`code` AS systemCode
+        FROM
+        cb_water_resource r
+        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
+        r.resource_type = 'pool'
         AND r.is_delete = 1
         AND ou.`code` IS NOT NULL
         <if test="bizOrgCode!=null and bizOrgCode!=''">
@@ -2435,8 +2520,10 @@
         </if>
         GROUP BY
         r.sequence_nbr
+        ) a
+        )) b
         ORDER BY
-        levelStatus DESC
+        levelStatus DESC,sequence_nbr DESC
     </select>
 
     <select id="getFireSystemInfo"  resultType="java.util.Map">
@@ -2867,46 +2954,75 @@
     <select id="getWaterPoolInfoNum" resultType="java.util.Map">
         SELECT
         count( 1 ) AS totalNum,
-        count( a.nowLevel &lt; a.minLevel OR NULL ) AS abnomalNum,
-        count( a.nowLevel &gt;= a.minLevel OR NULL ) AS nomalNum,
+        count( a.minLevel > a.nowLevel OR NULL ) AS abnomalNum,
+        count( a.nowLevel >= a.minLevel OR NULL ) AS nomalNum,
         (
         FORMAT (
         abs(((
-        count( a.nowLevel &gt;= a.minLevel OR NULL )) /
+        count( a.nowLevel >= a.minLevel OR NULL )) /
         IF
-        (( count( 1 ) = 0 ), 1, count( 1 ) ))) * 100, 2)
+        (( count( 1 ) = 0 ), 1, count( 1 ) ))) * 100,
+        2
+        )
         ) AS normalAbs
         FROM
         (
         SELECT
         ifnull( `rp`.`min_water_level`, 0 ) AS `minLevel`,
         ifnull( `rp`.`max_water_level`, 0 ) AS `maxLevel`,
-        ifnull(
-        max((
-        CASE
+        avg( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' THEN IFNULL( ei.`value`, 0 ) END ) 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 != ''">
+            AND r.`biz_org_code` like concat(#{bizOrgCode}, '%')
+        </if>
+        AND `r`.`resource_type` = 'pool'
+        GROUP BY
+        `r`.`sequence_nbr`
+        ) a
+    </select>
 
-        WHEN ( `ei`.`name_key` = 'FHS_WirelessliquidDetector_WaterLevel' ) THEN
-        `ei`.`perf_value`
-        END
-        )),
-        ifnull( `rp`.`min_water_level`, 0 )) AS `nowLevel`
+
+    <select id="getWaterIndustryPoolInfoNum" resultType="java.util.Map">
+        SELECT
+        count( 1 ) AS totalNum,
+        count( a.minLevel > a.nowLevel OR NULL ) AS abnomalNum,
+        count( a.nowLevel >= a.minLevel OR NULL ) AS nomalNum,
+        (
+        FORMAT (
+        abs(((
+        count( a.nowLevel >= a.minLevel OR NULL )) /
+        IF
+        (( count( 1 ) = 0 ), 1, count( 1 ) ))) * 100,
+        2
+        )
+        ) AS normalAbs
+        FROM
+        (
+        SELECT
+        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' THEN IFNULL( ei.`value`, 0 ) END ) 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` `es` ON `es`.`id` = `rp`.`level_device_id`
-        LEFT JOIN `wl_equipment_detail` `ed` ON `ed`.`id` = `es`.`equipment_detail_id`
-        LEFT JOIN `wl_equipment_index` `ei` ON `ei`.`equipment_id` = `ed`.`equipment_id`
+        LEFT JOIN `wl_equipment_specific_index` `ei` ON `ei`.`equipment_specific_id` = `rp`.`level_device_id`
         WHERE
         `r`.`is_delete` = 1
         <if test="bizOrgCode != null and bizOrgCode != ''">
             AND r.`biz_org_code` like concat(#{bizOrgCode}, '%')
         </if>
-            AND `r`.`resource_type` = #{poolType}
+        AND `r`.`resource_type` = 'industryPool'
         GROUP BY
         `r`.`sequence_nbr`
         ) a
     </select>
 
+
     <select id="getWaterPoolVolumeInfo" resultType="java.util.Map">
         SELECT
             IFNULL( sum( a.margin ), 0 ) AS margin,
@@ -4411,7 +4527,8 @@
     </select>
 
     <select id="getWaterInfoBySuper" resultType="java.util.Map">
-        SELECT
+        select * from (
+        (SELECT
         r.`name`,
         ou.`code`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
@@ -4467,13 +4584,94 @@
         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 es ON es.id = rp.level_device_id
-        LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
         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
         LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
         WHERE
-        r.resource_type IN ( 'pool', 'industryPool' )
+        r.resource_type = 'industryPool'
+        AND r.is_delete = 1
+        AND ou.`code` IS NOT NULL
+        <if test="bizOrgCode!=null and bizOrgCode!=''">
+            AND r.biz_org_code like concat(#{bizOrgCode}, '%')
+        </if>
+        GROUP BY
+        r.sequence_nbr) union all
+        (
+        SELECT
+        a.`name`,
+        a.`code`,
+        a.minLevel,
+        a.maxLevel,
+        (
+        CASE
+
+        WHEN a.nowLevel IS NULL THEN
+        '--'
+        WHEN a.nowLevel >= IFNULL( a.minLevel, 0 )
+        AND a.maxLevel IS NULL THEN
+        '100'
+        WHEN IFNULL( a.minLevel, 0 ) > a.nowLevel
+        AND a.maxLevel IS NULL THEN
+        '--' ELSE IFNULL((
+        FORMAT(
+        abs(
+        IFNULL(
+        a.nowLevel,
+        IFNULL( a.minLevel, 0 )) /
+        IF
+        (
+        IFNULL( a.maxLevel, 0 ) = 0,
+        1,
+        IFNULL( a.maxLevel, 0 ))) * 100,
+        2
+        )
+        ),
+        0
+        )
+        END
+        ) AS levelAbs,
+        a.nowLevel,
+        (
+        CASE
+
+        WHEN a.nowLevel IS NULL
+        OR a.minLevel IS NULL THEN
+        '--'
+        WHEN IFNULL( a.minLevel, 0 ) > IFNULL(
+        a.nowLevel,
+        IFNULL( a.minLevel, 0 )) THEN
+        '缺水' ELSE '正常'
+        END
+        ) AS levelStatus,
+        a.volume,
+        a.image,
+        a.resource_type,
+        a.sequence_nbr,
+        a.`code` AS systemCode
+        FROM
+        (
+        SELECT
+        r.`name`,
+        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' THEN IFNULL( ei.`value`, 0 ) END ) AS nowLevel,
+        IFNULL( rp.volume, 0 ) AS volume,
+        ec.image,
+        r.resource_type,
+        r.sequence_nbr,
+        rp.level_device_id,
+        fs.`code` AS systemCode
+        FROM
+        cb_water_resource r
+        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
+        r.resource_type = 'pool'
         AND r.is_delete = 1
         AND ou.`code` IS NOT NULL
         <if test="bizOrgCode!=null and bizOrgCode!=''">
@@ -4481,8 +4679,10 @@
         </if>
         GROUP BY
         r.sequence_nbr
+        ) a
+        )) b
         ORDER BY
-        levelStatus DESC
+        levelStatus DESC,sequence_nbr DESC
     </select>
 
     <select id="getFoamTankBySuper" resultType="java.util.Map">

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3448,5 +3448,15 @@
                 CHANGE COLUMN `user_name` `usr_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户名' AFTER `sequence_nbr`
         </sql>
     </changeSet>
+
+    <changeSet author="zs" id="202210101353">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_water_resource_pool"/>
+        </preConditions>
+        <comment>修改液位显示装置字段类型->需求2022 一个水池可选多个 装置</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool` MODIFY COLUMN `level_device_id` varchar(255) NULL DEFAULT NULL COMMENT '水池液位显示装置id';
+        </sql>
+    </changeSet>
 </databaseChangeLog>