新增三资公开区域筛选接口

lidongdong

2023-06-27 c6a264ed485b098ccef024f2c0cc26dc80bd5335

新增三资公开区域筛选接口

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommonDataApi.java

@@ -82,6 +82,13 @@
        return communityService.getCityTreeByProvinceCode(provinceAdcode, this.getAreaCode());
    }

    @ApiOperation(value = "获取树结构区域信息  三资公开用")
    @GetMapping(value = "getCityTreeByCode")
    public R getCityTreeByCode(@ApiParam(name = "省份:四川510000",
        required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return communityService.getCityTreeByCode(provinceAdcode, this.getAreaCode());
    }

    @ApiOperation(value = "特殊群体/分页查询标签列表", response = ComMngTagVO.class)
    @PostMapping("/special/tags/page")
    public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -2265,6 +2265,17 @@
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);

    /**
     * 查询省下所有区域 tree结构
     *
     * @param provinceAdcode
     *            省份code
     * @param areaCode
     * @return 查询结果
     */
    @GetMapping("/common/data/area/basiclevel")
    R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);

    /**
     * 分页查询街道
     *
     * @param pageComStreetDTO

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -324,6 +324,19 @@
        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode, areaCode);
    }


    /**
     * 获取省下的所有区域 tree结构 基层公开用
     *
     * @param provinceAdcode
     * @return
     */
    @GetMapping("/area/basiclevel")
    public R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
                                       @RequestParam(value = "areaCode", required = false) String areaCode) {
        return comMngProvinceService.getCityTreeByCode(provinceAdcode, areaCode);
    }

    /**
     * 社区后台实有人口管理列表
     *

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngProvinceService.java

@@ -40,4 +40,15 @@
     * @return
     */
    R getCityTreeByProvinceCode(Integer provinceAdcode, String areaCode);



    /**
     * 获取省下的所有区域 tree结构 基层公开用
     *
     * @param provinceAdcode
     * @param areaCode
     * @return
     */
    R getCityTreeByCode(Integer provinceAdcode, String areaCode);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java

@@ -107,4 +107,36 @@
        });
        return R.ok(vos);
    }

    @Override
    public R getCityTreeByCode(Integer provinceAdcode, String areaCode) {
        //四川省
        List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(
                new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
        List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(new QueryWrapper<>());
        List<ComMngDistrictDO> districtDOS = comMngDistrictDAO.selectList(new QueryWrapper<>());
        List<ComMngAreaVO> vos = new ArrayList<>();
        provinceDOS.forEach(p -> {
            ComMngAreaVO pvo = new ComMngAreaVO(p.getProvinceAdcode(), p.getProvinceName());
            List<ComMngCityDO> citys = cityDOS.stream().filter(
                            city -> city.getProvinceAdcode().equals(p.getProvinceAdcode()) && city.getCityAdcode().equals(510400))
                    .collect(Collectors.toList());
            citys.forEach(c -> {
                ComMngAreaVO cityVo = new ComMngAreaVO(c.getCityAdcode(), c.getCityName());
                BeanUtils.copyProperties(c, cityVo);
                pvo.getChildren().add(cityVo);
                List<ComMngDistrictDO> districts =
                        districtDOS.stream().filter(district -> district.getCityAdcode().equals(c.getCityAdcode()))
                                .collect(Collectors.toList());
                districts.forEach(d -> {
                    ComMngAreaVO districtVo = new ComMngAreaVO(d.getDistrictAdcode(), d.getDistrictName());
                    BeanUtils.copyProperties(d, districtVo);
                    cityVo.getChildren().add(districtVo);
                    vos.add(districtVo);
                });
            });
//            vos.add(pvo);
        });
        return R.ok(vos);
    }
}