设备，场景，区域，派出所新增list

rain

2026-01-13 6b3eead4b660064f58412c80d36b35cc659fc077

设备，场景，区域，派出所新增list

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

@@ -82,15 +82,15 @@
        return R.data(detail);
    }
    /**
     * 区域划分表 分页
     * 区域划分表 列表
     */
    // @GetMapping("/list")
    // @ApiOperationSupport(order = 2)
    // @ApiOperation(value = "分页", notes = "传入fwAreaDivide")
    // public R<IPage<FwAreaDivideVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwAreaDivide, Query query) {
    //     IPage<FwAreaDivideEntity> pages = fwAreaDivideService.page(Condition.getPage(query), Condition.getQueryWrapper(fwAreaDivide, FwAreaDivideEntity.class));
    //     return R.data(FwAreaDivideWrapper.build().pageVO(pages));
    // }
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "列表", notes = "传入filterSelected")
    public R<List<FwAreaDivideVO>> list(@ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected) {
        List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected);
        return R.data(list);
    }

    /**
     * 区域划分表 自定义分页

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

@@ -73,15 +73,15 @@
        return R.data(FwDefenseSceneWrapper.build().entityVO(detail));
    }
    /**
     * 防控场景表 分页
     * 防控场景表 列表
     */
    // @GetMapping("/list")
    // @ApiOperationSupport(order = 2)
    // @ApiOperation(value = "分页", notes = "传入fwDefenseScene")
    // public R<IPage<FwDefenseSceneVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDefenseScene, Query query) {
    //     IPage<FwDefenseSceneEntity> pages = fwDefenseSceneService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDefenseScene, FwDefenseSceneEntity.class));
    //     return R.data(FwDefenseSceneWrapper.build().pageVO(pages));
    // }
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "列表", notes = "传入filterSelected")
    public R<List<FwDefenseSceneVO>> list(@ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected) {
        List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected);
        return R.data(list);
    }

    /**
     * 防控场景表 自定义分页

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

@@ -84,6 +84,17 @@
//    }

    /**
     * 派出所信息表 列表
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "列表", notes = "获取全部派出所")
    public R<List<FwPoliceStationVO>> list() {
        List<FwPoliceStationVO> list = fwPoliceStationService.selectFwPoliceStationList();
        return R.data(list);
    }

    /**
     * 派出所信息表 自定义分页
     */
    @GetMapping("/page")

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

@@ -46,6 +46,14 @@
    List<FwAreaDivideVO> selectFwAreaDividePage(IPage page, FwAreaDivideDTO fwAreaDivide);

    /**
     * 列表
     *
     * @param filterSelected
     * @return
     */
    List<FwAreaDivideVO> selectFwAreaDivideList(@Param("filterSelected") Integer filterSelected);

    /**
     * 统计分页
     *
     * @param page

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

@@ -52,7 +52,11 @@
        ad.longitude,
        ad.latitude,
        ad.area_size,
        concat(ST_AsText(ST_SwapXY(ad.geom)), ' | ', ST_SRID(ad.geom)) as geom,
        case
            when ad.geom is null then null
            when ST_SRID(ad.geom) is null or ST_SRID(ad.geom) = 0 then ST_AsText(ad.geom)
            else concat(ST_AsText(ST_SwapXY(ad.geom)), ' | ', ST_SRID(ad.geom))
        end as geom,
        ad.area_type,
        ad.trigger_condition,
        ad.response_mechanism,
@@ -119,6 +123,52 @@
        </where>
    </select>

    <select id="selectFwAreaDivideList" resultMap="fwAreaDivideResultMap">
        select
        ad.id,
        ad.area_name,
        ad.longitude,
        ad.latitude,
        ad.area_size,
        case
            when ad.geom is null then null
            when ST_SRID(ad.geom) is null or ST_SRID(ad.geom) = 0 then ST_AsText(ad.geom)
            else concat(ST_AsText(ST_SwapXY(ad.geom)), ' | ', ST_SRID(ad.geom))
        end as geom,
        ad.area_type,
        ad.trigger_condition,
        ad.response_mechanism,
        ad.control_level,
        ad.police_station_id,
        ad.device_ids,
        ad.fly_date_start,
        ad.fly_date_end,
        ad.area_code,
        ps.station_name as police_station_name,
        ad.create_user,
        ad.create_dept,
        ad.create_time,
        ad.update_user,
        ad.update_time,
        ad.status,
        ad.is_deleted
        from ja_fw_area_divide ad
        left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
        <where>
            ad.is_deleted = 0
            <if test="filterSelected != null and filterSelected == 1">
                and not exists (
                    select 1
                    from ja_fw_defense_scene ds
                    where ds.is_deleted = 0
                      and ds.area_divide_ids is not null
                      and ds.area_divide_ids != ''
                      and find_in_set(ad.id, ds.area_divide_ids)
                )
            </if>
        </where>
    </select>

    <select id="selectFwAreaDivideDetail" resultMap="fwAreaDivideResultMap">
        select
        ad.id,
@@ -126,7 +176,11 @@
        ad.longitude,
        ad.latitude,
        ad.area_size,
        concat(ST_AsText(ST_SwapXY(ad.geom)), ' | ', ST_SRID(ad.geom)) as geom,
        case
            when ad.geom is null then null
            when ST_SRID(ad.geom) is null or ST_SRID(ad.geom) = 0 then ST_AsText(ad.geom)
            else concat(ST_AsText(ST_SwapXY(ad.geom)), ' | ', ST_SRID(ad.geom))
        end as geom,
        ad.area_type,
        ad.trigger_condition,
        ad.response_mechanism,

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

@@ -42,6 +42,14 @@
     */
    List<FwDefenseSceneVO> selectFwDefenseScenePage(IPage page, FwDefenseSceneVO fwDefenseScene);

    /**
     * 列表
     *
     * @param filterSelected
     * @return
     */
    List<FwDefenseSceneVO> selectFwDefenseSceneList(@Param("filterSelected") Integer filterSelected);


    /**
     * 获取导出数据

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

@@ -83,6 +83,23 @@
        </where>
    </select>

    <select id="selectFwDefenseSceneList" resultMap="fwDefenseSceneResultMap">
        select ds.* from ja_fw_defense_scene ds
        <where>
            ds.is_deleted = 0
            <if test="filterSelected != null and filterSelected == 1">
                and not exists (
                    select 1
                    from ja_fw_defense_zone dz
                    where dz.is_deleted = 0
                      and dz.defense_scene_ids is not null
                      and dz.defense_scene_ids != ''
                      and find_in_set(ds.id, dz.defense_scene_ids)
                )
            </if>
        </where>
    </select>


    <select id="exportFwDefenseScene" resultType="org.sxkj.fw.area.excel.FwDefenseSceneExcel">
        SELECT * FROM ja_fw_defense_scene ${ew.customSqlSegment}

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

@@ -42,6 +42,13 @@
     */
    List<FwPoliceStationVO> selectFwPoliceStationPage(IPage page, FwPoliceStationVO fwPoliceStation);

    /**
     * 列表
     *
     * @return
     */
    List<FwPoliceStationVO> selectFwPoliceStationList();


    /**
     * 获取导出数据

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

@@ -71,6 +71,13 @@
        </where>
    </select>

    <select id="selectFwPoliceStationList" resultMap="fwPoliceStationResultMap">
        select * from ja_fw_police_station
        <where>
            is_deleted = 0
        </where>
    </select>


    <select id="exportFwPoliceStation" resultType="org.sxkj.fw.area.excel.FwPoliceStationExcel">
        SELECT * FROM ja_fw_police_station ${ew.customSqlSegment}

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

@@ -44,6 +44,14 @@
    IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide);

    /**
     * 列表
     *
     * @param filterSelected
     * @return
     */
    List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected);

    /**
     * 统计分页
     *
     * @param page

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

@@ -40,6 +40,14 @@
     */
    IPage<FwDefenseSceneVO> selectFwDefenseScenePage(IPage<FwDefenseSceneVO> page, FwDefenseSceneVO fwDefenseScene);

    /**
     * 列表
     *
     * @param filterSelected
     * @return
     */
    List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected);


    /**
     * 导出数据

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

@@ -40,6 +40,13 @@
     */
    IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationVO fwPoliceStation);

    /**
     * 列表
     *
     * @return
     */
    List<FwPoliceStationVO> selectFwPoliceStationList();


    /**
     * 导出数据

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

@@ -49,6 +49,11 @@
    }

    @Override
    public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected) {
        return baseMapper.selectFwAreaDivideList(filterSelected);
    }

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

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

@@ -133,6 +133,11 @@
        return result;
    }

    @Override
    public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected) {
        return baseMapper.selectFwDefenseSceneList(filterSelected);
    }

    private List<Long> parseIdList(String ids) {
        if (StringUtil.isBlank(ids)) {
            return Collections.emptyList();

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

@@ -45,6 +45,11 @@
        return page.setRecords(baseMapper.selectFwPoliceStationPage(page, fwPoliceStation));
    }

    @Override
    public List<FwPoliceStationVO> selectFwPoliceStationList() {
        return baseMapper.selectFwPoliceStationList();
    }


    @Override
    public List<FwPoliceStationExcel> exportFwPoliceStation(Wrapper<FwPoliceStationEntity> queryWrapper) {

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java

@@ -48,6 +48,7 @@
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 设备表 控制器
@@ -80,10 +81,22 @@
    }

    /**
     * 设备表 列表
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "列表", notes = "仅传入isAreaSelect")
    public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect) {
        List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect);
        FwDeviceWrapper wrapper = FwDeviceWrapper.build();
        return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
    }

    /**
     * 设备表 自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 2)
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入fwDevice")
    public R<IPage<FwDeviceVO>> page(FwDevicePageParam fwDevice, Query query) {
        IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), GenericConverter.convert(fwDevice, FwDeviceDTO.class));
@@ -94,7 +107,7 @@
     * 设备表 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 3)
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增或修改", notes = "传入fwDevice")
    public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
        return R.status(fwDeviceService.saveOrUpdate(FwDeviceWrapper.build().entityDTO(fwDevice)));
@@ -104,7 +117,7 @@
     * 设备表 删除
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 4)
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(fwDeviceService.deleteLogic(Func.toLongList(ids)));
@@ -115,7 +128,7 @@
     * 导出数据
     */
    @GetMapping("/export-fwDevice")
    @ApiOperationSupport(order = 5)
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "导出数据", notes = "传入fwDevice")
    @ApiIgnore
    public void exportFwDevice(@ApiIgnore @RequestParam Map<String, Object> fwDevice, BladeUser bladeUser, HttpServletResponse response) {

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java

@@ -46,6 +46,14 @@
     */
    List<FwDeviceEntity> selectFwDevicePage(IPage page, FwDeviceDTO fwDevice);

    /**
     * 列表查询
     *
     * @param isAreaSelect
     * @return
     */
    List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect);


    /**
     * 获取导出数据

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml

@@ -77,6 +77,23 @@
        </where>
    </select>

    <select id="selectFwDeviceList" resultMap="fwDeviceResultMap">
        select * from ja_fw_device
        <where>
            is_deleted = 0
            <if test="isAreaSelect != null and isAreaSelect == 1">
                and not exists (
                    select 1
                    from ja_fw_area_divide ad
                    where ad.is_deleted = 0
                    and ad.device_ids is not null
                    and ad.device_ids != ''
                    and find_in_set(ja_fw_device.id, ad.device_ids)
                )
            </if>
        </where>
    </select>


    <select id="exportFwDevice" resultType="org.sxkj.fw.device.excel.FwDeviceExcel">
        SELECT * FROM ja_fw_device ${ew.customSqlSegment}

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

@@ -44,6 +44,14 @@
     */
    IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice);

    /**
     * 列表查询
     *
     * @param isAreaSelect
     * @return
     */
    List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect);


    /**
     * 导出数据

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -45,6 +45,11 @@
        return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
    }

    @Override
    public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect) {
        return baseMapper.selectFwDeviceList(isAreaSelect);
    }


    @Override
    public List<FwDeviceExcel> exportFwDevice(Wrapper<FwDeviceEntity> queryWrapper) {