区域模块增加统计分页和统计详情

rain

2026-01-13 de478946803e8034a68751e18e7eed3805ac43dd

区域模块增加统计分页和统计详情

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java

@@ -34,8 +34,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.fw.area.dto.FwAreaDivideDTO;
import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.springblade.core.boot.ctrl.BladeController;
@@ -102,6 +104,34 @@
    }

    /**
     * 区域划分统计 分页
     */
    @GetMapping("/divideStatisticsPage")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "统计分页", notes = "传入统计条件")
    public R<IPage<FwAreaDivideStatisticsVO>> divideStatisticsPage(FwAreaDivideStatisticsDTO fwAreaDivideStatistics, Query query) {
        IPage<FwAreaDivideStatisticsVO> pages = fwAreaDivideService.selectFwAreaDivideStatisticsPage(Condition.getPage(query), fwAreaDivideStatistics);
        return R.data(pages);
    }

    /**
     * 区域划分统计 详情
     */
    @GetMapping("/statisticsDetail")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "统计详情", notes = "传入id")
    public R<FwAreaDivideStatisticsVO> statisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
        if (fwAreaDivideStatistics == null || fwAreaDivideStatistics.getId() == null) {
            return R.fail("主键不能为空");
        }
        FwAreaDivideStatisticsVO detail = fwAreaDivideService.selectFwAreaDivideStatisticsDetail(fwAreaDivideStatistics);
        if (detail == null) {
            return R.fail("数据不存在");
        }
        return R.data(detail);
    }

    /**
     * 区域划分表 新增
     */
    // @PostMapping("/save")

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.java

@@ -17,8 +17,10 @@
package org.sxkj.fw.area.mapper;

import org.sxkj.fw.area.dto.FwAreaDivideDTO;
import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -44,6 +46,23 @@
    List<FwAreaDivideVO> selectFwAreaDividePage(IPage page, FwAreaDivideDTO fwAreaDivide);

    /**
     * 统计分页
     *
     * @param page
     * @param fwAreaDivideStatistics
     * @return
     */
    List<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage page, FwAreaDivideStatisticsDTO fwAreaDivideStatistics);

    /**
     * 统计详情
     *
     * @param fwAreaDivideStatistics
     * @return
     */
    FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics);

    /**
     * 详情
     *
     * @param id

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml

@@ -31,6 +31,19 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>

    <resultMap id="fwAreaDivideStatisticsResultMap" type="org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO">
        <result column="id" property="id"/>
        <result column="area_name" property="areaName"/>
        <result column="area_type" property="areaType"/>
        <result column="scene_name" property="sceneName"/>
        <result column="scene_type" property="sceneType"/>
        <result column="device_count" property="deviceCount"/>
        <result column="alarm_count" property="alarmCount"/>
        <result column="counter_count" property="counterCount"/>
        <result column="counter_success_count" property="counterSuccessCount"/>
        <result column="control_effect" property="controlEffect"/>
    </resultMap>


    <select id="selectFwAreaDividePage" resultMap="fwAreaDivideResultMap">
        select
@@ -150,6 +163,185 @@
          and ad.id = #{id}
    </select>

    <select id="selectFwAreaDivideStatisticsPage" resultMap="fwAreaDivideStatisticsResultMap">
        select
        stats.id,
        stats.area_name,
        stats.area_type,
        stats.scene_name,
        stats.scene_type,
        stats.device_count,
        stats.alarm_count,
        stats.counter_count,
        stats.counter_success_count,
        case
            when stats.counter_count = 0 then '/'
            when stats.counter_success_count * 100.0 / stats.counter_count &gt;= 80 then '好'
            when stats.counter_success_count * 100.0 / stats.counter_count &gt;= 60 then '一般'
            else '差'
        end as control_effect
        from (
            select
            ad.id,
            ad.area_name,
            ad.area_type,
            (
                select group_concat(distinct ds.scene_name)
                from ja_fw_defense_scene ds
                where ds.is_deleted = 0
                  and find_in_set(ad.id, ds.area_divide_ids)
            ) as scene_name,
            (
                select group_concat(distinct ds.scene_type)
                from ja_fw_defense_scene ds
                where ds.is_deleted = 0
                  and find_in_set(ad.id, ds.area_divide_ids)
            ) as scene_type,
            case
                when ad.device_ids is null or trim(ad.device_ids) = '' then 0
                else length(replace(ad.device_ids, ' ', '')) - length(replace(replace(ad.device_ids, ' ', ''), ',', '')) + 1
            end as device_count,
            case
                when ad.device_ids is null or trim(ad.device_ids) = '' then 0
                else (
                    select count(1)
                    from ja_fw_drone_alarm_record ar
                    join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
                    where ar.is_deleted = 0
                      and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
                )
            end as alarm_count,
            case
                when ad.device_ids is null or trim(ad.device_ids) = '' then 0
                else (
                    select count(1)
                    from ja_fw_effect_eval ee
                    join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
                    where ee.is_deleted = 0
                      and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
                )
            end as counter_count,
            case
                when ad.device_ids is null or trim(ad.device_ids) = '' then 0
                else (
                    select count(1)
                    from ja_fw_effect_eval ee
                    join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
                    where ee.is_deleted = 0
                      and ee.counter_effect = 'success'
                      and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
                )
            end as counter_success_count
            from ja_fw_area_divide ad
            <where>
                ad.is_deleted = 0
                <if test="param2.id != null and param2.id != ''">
                    and ad.id = #{param2.id}
                </if>
                <if test="param2.areaName != null and param2.areaName != ''">
                    and ad.area_name like concat('%', #{param2.areaName}, '%')
                </if>
                <if test="param2.areaType != null and param2.areaType != ''">
                    and ad.area_type = #{param2.areaType}
                </if>
                <if test="param2.sceneType != null and param2.sceneType != ''">
                    and exists (
                        select 1
                        from ja_fw_defense_scene ds
                        where ds.is_deleted = 0
                          and find_in_set(ad.id, ds.area_divide_ids)
                          and ds.scene_type = #{param2.sceneType}
                    )
                </if>
                <if test="param2.areaCode != null and param2.areaCode != ''">
                    and ad.area_code = #{param2.areaCode}
                </if>
            </where>
        ) stats
    </select>

    <select id="selectFwAreaDivideStatisticsDetail" resultMap="fwAreaDivideStatisticsResultMap">
        select
        stats.id,
        stats.area_name,
        stats.area_type,
        stats.scene_name,
        stats.scene_type,
        stats.device_count,
        stats.alarm_count,
        stats.counter_count,
        stats.counter_success_count,
        case
            when stats.counter_count = 0 then '/'
            when stats.counter_success_count * 100.0 / stats.counter_count &gt;= 80 then '好'
            when stats.counter_success_count * 100.0 / stats.counter_count &gt;= 60 then '一般'
            else '差'
        end as control_effect
        from (
            select
            ad.id,
            ad.area_name,
            ad.area_type,
            (
                select group_concat(distinct ds.scene_name)
                from ja_fw_defense_scene ds
                where ds.is_deleted = 0
                  and find_in_set(ad.id, ds.area_divide_ids)
            ) as scene_name,
            (
                select group_concat(distinct ds.scene_type)
                from ja_fw_defense_scene ds
                where ds.is_deleted = 0
                  and find_in_set(ad.id, ds.area_divide_ids)
            ) as scene_type,
            case
                when ad.device_ids is null or trim(ad.device_ids) = '' then 0
                else length(replace(ad.device_ids, ' ', '')) - length(replace(replace(ad.device_ids, ' ', ''), ',', '')) + 1
            end as device_count,
            case
                when ad.device_ids is null or trim(ad.device_ids) = '' then 0
                else (
                    select count(1)
                    from ja_fw_drone_alarm_record ar
                    join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
                    where ar.is_deleted = 0
                      and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
                )
            end as alarm_count,
            case
                when ad.device_ids is null or trim(ad.device_ids) = '' then 0
                else (
                    select count(1)
                    from ja_fw_effect_eval ee
                    join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
                    where ee.is_deleted = 0
                      and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
                )
            end as counter_count,
            case
                when ad.device_ids is null or trim(ad.device_ids) = '' then 0
                else (
                    select count(1)
                    from ja_fw_effect_eval ee
                    join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
                    where ee.is_deleted = 0
                      and ee.counter_effect = 'success'
                      and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
                )
            end as counter_success_count
            from ja_fw_area_divide ad
            <where>
                ad.is_deleted = 0
                <if test="id != null and id != ''">
                    and ad.id = #{id}
                </if>
                <if test="areaCode != null and areaCode != ''">
                    and ad.area_code = #{areaCode}
                </if>
            </where>
        ) stats
    </select>


    <select id="exportFwAreaDivide" resultType="org.sxkj.fw.area.excel.FwAreaDivideExcel">
        SELECT

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java

@@ -18,8 +18,10 @@

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.fw.area.dto.FwAreaDivideDTO;
import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
@@ -42,6 +44,23 @@
    IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide);

    /**
     * 统计分页
     *
     * @param page
     * @param fwAreaDivideStatistics
     * @return
     */
    IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page, FwAreaDivideStatisticsDTO fwAreaDivideStatistics);

    /**
     * 统计详情
     *
     * @param fwAreaDivideStatistics
     * @return
     */
    FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics);

    /**
     * 详情
     *
     * @param id

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java

@@ -20,8 +20,10 @@
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.area.dto.FwAreaDivideDTO;
import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
import org.sxkj.fw.area.mapper.FwAreaDivideMapper;
import org.sxkj.fw.area.service.IFwAreaDivideService;
@@ -47,6 +49,16 @@
    }

    @Override
    public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page, FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
        return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
    }

    @Override
    public FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
        return baseMapper.selectFwAreaDivideStatisticsDetail(fwAreaDivideStatistics);
    }

    @Override
    public FwAreaDivideVO selectFwAreaDivideDetail(Long id) {
        return baseMapper.selectFwAreaDivideDetail(id);
    }

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java

@@ -102,6 +102,12 @@
    private BigDecimal effectiveRangeKm;

    /**
     * 有效范围 km
     */
    @ApiModelProperty(value = "是否有范围 0不过滤 1有 2没有")
    private int effectiveRangeKmIsNotNull ;

    /**
     * 设备状态，多个状态用逗号隔
     */
    @ApiModelProperty(value = "设备状态，多个状态用逗号隔开")

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java

@@ -33,5 +33,5 @@
     * 有效范围是否为空：0-不处理 1-不为空 2-为空
     */
    @ApiModelProperty(value = "有效范围是否为空：0-不处理 1-不为空 2-为空")
    private Integer effectiveRangeKmIsNotNull;
    private int effectiveRangeKmIsNotNull;
}