场景配置list接口优化

rain

2026-01-30 207c5007521998d87083f92f8baf35518e68d44e

场景配置list接口优化

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

@@ -77,13 +77,14 @@
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "列表", notes = "传入filterSelected或zoneId或areaId或unbound")
    @ApiOperation(value = "列表", notes = "传入filterSelected或zoneId或areaId或unbound或sceneManageId")
    public R<List<FwDefenseSceneVO>> list(
        @ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected,
        @ApiParam(value = "防区id") @RequestParam(required = false) Long zoneId,
        @ApiParam(value = "区域id") @RequestParam(required = false) Long areaId,
        @ApiParam(value = "是否仅返回未被场景管理绑定的数据（1是 0或空否）") @RequestParam(required = false) Integer unbound) {
        List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId, areaId, unbound);
        @ApiParam(value = "是否仅返回未被场景管理绑定的数据（1是 0或空否）") @RequestParam(required = false) Integer unbound,
        @ApiParam(value = "场景管理id（编辑回显使用）") @RequestParam(required = false) Long sceneManageId) {
        List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId, areaId, unbound, sceneManageId);
        return R.data(list);
    }


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

@@ -49,9 +49,10 @@
     * @param zoneId
     * @param areaId
     * @param unbound
     * @param sceneManageId
     * @return
     */
    List<FwDefenseSceneVO> selectFwDefenseSceneList(@Param("filterSelected") Integer filterSelected, @Param("zoneId") Long zoneId, @Param("areaId") Long areaId, @Param("unbound") Integer unbound);
    List<FwDefenseSceneVO> selectFwDefenseSceneList(@Param("filterSelected") Integer filterSelected, @Param("zoneId") Long zoneId, @Param("areaId") Long areaId, @Param("unbound") Integer unbound, @Param("sceneManageId") Long sceneManageId);


    /**

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

@@ -54,11 +54,22 @@
        <where>
            ds.is_deleted = 0
            <if test="unbound != null and unbound == 1">
                and not exists (
                    select 1
                    from ja_fw_defense_scene_manage dsm
                    where dsm.is_deleted = 0
                      and dsm.defense_scene_id = ds.id
                and (
                    not exists (
                        select 1
                        from ja_fw_defense_scene_manage dsm
                        where dsm.is_deleted = 0
                          and dsm.defense_scene_id = ds.id
                    )
                    <if test="sceneManageId != null">
                        or exists (
                            select 1
                            from ja_fw_defense_scene_manage dsm
                            where dsm.is_deleted = 0
                              and dsm.id = #{sceneManageId}
                              and dsm.defense_scene_id = ds.id
                        )
                    </if>
                )
            </if>
            <if test="filterSelected != null and filterSelected == 1">

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

@@ -47,9 +47,10 @@
     * @param zoneId
     * @param areaId
     * @param unbound
     * @param sceneManageId
     * @return
     */
    List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId, Integer unbound);
    List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId, Integer unbound, Long sceneManageId);


    /**

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

@@ -137,8 +137,8 @@
    }

    @Override
    public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId, Integer unbound) {
        return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId, unbound);
    public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId, Integer unbound, Long sceneManageId) {
        return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId, unbound, sceneManageId);
    }

    private List<Long> parseIdList(String ids) {