lidongdong
2023-06-27 a5065edde51c1ed77153cf043e2eeb014926225c
新增三资公开区域筛选接口添加街道信息
2个文件已修改
41 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngAreaVO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngAreaVO.java
@@ -15,6 +15,10 @@
    @ApiModelProperty("城市行政区划代码")
    private Integer code;
    /** 城市行政区划代码 */
    @ApiModelProperty("街道id")
    private String streetId;
    /** 城市名称 */
    @ApiModelProperty("城市名称")
    private String Name;
@@ -27,5 +31,11 @@
        Name = name;
    }
    public ComMngAreaVO(Integer code, String name,String streetId) {
        this.code = code;
        Name = name;
        this.streetId = streetId;
    }
    public ComMngAreaVO() {}
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -6,20 +6,16 @@
import javax.annotation.Resource;
import com.google.common.collect.Lists;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngAreaVO;
import com.panzhihua.common.model.vos.community.ComMngCityVO;
import com.panzhihua.common.model.vos.community.ComMngDistrictVO;
import com.panzhihua.common.model.vos.community.ComMngProvinceVO;
import com.panzhihua.service_community.dao.ComMngCityDAO;
import com.panzhihua.service_community.dao.ComMngDistrictDAO;
import com.panzhihua.service_community.dao.ComMngProvinceDAO;
import com.panzhihua.service_community.dao.ComMngStructAreaDAO;
import com.panzhihua.service_community.model.dos.ComMngCityDO;
import com.panzhihua.service_community.model.dos.ComMngDistrictDO;
import com.panzhihua.service_community.model.dos.ComMngProvinceDO;
@@ -38,7 +34,7 @@
    private ComMngDistrictDAO comMngDistrictDAO;
    @Resource
    private ComMngStructAreaDAO comMngStructAreaDAO;
    private ComStreetDAO comStreetDAO;
    @Override
    public R getProvince() {
@@ -133,9 +129,24 @@
                    BeanUtils.copyProperties(d, districtVo);
                    cityVo.getChildren().add(districtVo);
                    vos.add(districtVo);
                    LambdaQueryWrapper<ComStreetDO> param = new QueryWrapper<ComStreetDO>().lambda();
                    ComStreetVO comStreetVO=new ComStreetVO();
                    comStreetVO.setAreaCode(d.getDistrictAdcode());
                    if (comStreetVO.getAreaCode() != null) {
                        param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
                    }
                    List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
                    comStreetDOS.forEach(dos ->
                    {
                        ComMngAreaVO csd = new ComMngAreaVO(0, dos.getName(),dos.getStreetId()+"");
                        BeanUtils.copyProperties(dos, csd);
                        districtVo.getChildren().add(csd);
                    });
                });
            });
//            vos.add(pvo);
        });
        return R.ok(vos);
    }