修改街道获取接口数据重复

lidongdong

2023-07-10 598e1fcf3a358f123631e285dd288aea9412229d

修改街道获取接口数据重复

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

@@ -2273,7 +2273,9 @@
     * @return 查询结果
     */
    @GetMapping("/common/data/area/basiclevel")
    R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);
    R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
                        @RequestParam(value = "areaCode", required = false) String areaCode,
                        @RequestParam(value = "appId", required = false) String appId);

    /**
     * 分页查询街道

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

@@ -951,7 +951,7 @@
    @GetMapping(value = "getCityTreeByCode")
    public R getCityTreeByCode(@ApiParam(name = "省份:四川510000",
            required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return communityService.getCityTreeByCode(provinceAdcode, this.getAreaCode());
        return communityService.getCityTreeByCode(provinceAdcode, this.getAreaCode(),getAppId());
    }



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

@@ -333,8 +333,9 @@
     */
    @GetMapping("/area/basiclevel")
    public R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
                                       @RequestParam(value = "areaCode", required = false) String areaCode) {
        return comMngProvinceService.getCityTreeByCode(provinceAdcode, areaCode);
                               @RequestParam(value = "areaCode", required = false) String areaCode,
                               @RequestParam(value = "appId", required = false) String appId) {
        return comMngProvinceService.getCityTreeByCode(provinceAdcode, areaCode,appId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComStreetDO.java

@@ -58,6 +58,7 @@
     * 账号密码
     */
    private String password;
    private String appId;
    /**
     * 创建时间
     */

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

@@ -50,5 +50,5 @@
     * @param areaCode
     * @return
     */
    R getCityTreeByCode(Integer provinceAdcode, String areaCode);
    R getCityTreeByCode(Integer provinceAdcode, String areaCode,String appId);
}

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

@@ -115,7 +115,7 @@
    }

    @Override
    public R getCityTreeByCode(Integer provinceAdcode, String areaCode) {
    public R getCityTreeByCode(Integer provinceAdcode, String areaCode,String appId) {
        //四川省
        List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(
                new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
@@ -144,7 +144,8 @@
                    ComStreetVO comStreetVO=new ComStreetVO();
                    comStreetVO.setAreaCode(d.getDistrictAdcode());
                    if (comStreetVO.getAreaCode() != null) {
                        param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
                        param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode())
                                .eq(ComStreetDO::getAppId, appId);
                    }
                    List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
                    comStreetDOS.forEach(dos ->