From d0aa81c826a35adac91c0db38d3c98c38d507de1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 11:03:26 +0800
Subject: [PATCH] no
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
index 2d2332b..ce5aaf6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -2,6 +2,7 @@
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;
@@ -18,6 +19,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class ComMngProvinceServiceImpl implements ComMngProvinceService {
@@ -36,9 +38,9 @@
public R getProvince() {
List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(null);
List<ComMngProvinceVO> vos = new ArrayList<>();
- provinceDOS.forEach(p->{
+ provinceDOS.forEach(p -> {
ComMngProvinceVO vo = new ComMngProvinceVO();
- BeanUtils.copyProperties(p,vo);
+ BeanUtils.copyProperties(p, vo);
vos.add(vo);
});
return R.ok(vos);
@@ -46,24 +48,50 @@
@Override
public R getCityByProvinceCode(Integer provinceAdcode) {
- List<ComMngCityDO> comMngCityDOS = comMngCityDAO.selectList(new QueryWrapper<ComMngCityDO>().lambda().eq(ComMngCityDO::getProvinceAdcode,provinceAdcode));
+ List<ComMngCityDO> comMngCityDOS = comMngCityDAO.selectList(new QueryWrapper<ComMngCityDO>().lambda().eq(ComMngCityDO::getProvinceAdcode, provinceAdcode));
List<ComMngCityVO> vos = new ArrayList<>();
- comMngCityDOS.forEach(c->{
+ comMngCityDOS.forEach(c -> {
ComMngCityVO vo = new ComMngCityVO();
- BeanUtils.copyProperties(c,vo);
+ BeanUtils.copyProperties(c, vo);
+ vos.add(vo);
+ });
+ return R.ok(vos);
+ }
+
+
+ @Override
+ public R getDistrictByCityCode(Integer cityAdcode) {
+ List<ComMngDistrictDO> comMngDistrictDOS = comMngDistrictDAO.selectList(new QueryWrapper<ComMngDistrictDO>().lambda().eq(ComMngDistrictDO::getCityAdcode, cityAdcode));
+ List<ComMngDistrictVO> vos = new ArrayList<>();
+ comMngDistrictDOS.forEach(c -> {
+ ComMngDistrictVO vo = new ComMngDistrictVO();
+ BeanUtils.copyProperties(c, vo);
vos.add(vo);
});
return R.ok(vos);
}
@Override
- public R getDistrictByCityCode(Integer cityAdcode) {
- List<ComMngDistrictDO> comMngDistrictDOS = comMngDistrictDAO.selectList(new QueryWrapper<ComMngDistrictDO>().lambda().eq(ComMngDistrictDO::getCityAdcode,cityAdcode));
- List<ComMngDistrictVO> vos = new ArrayList<>();
- comMngDistrictDOS.forEach(c->{
- ComMngDistrictVO vo = new ComMngDistrictVO();
- BeanUtils.copyProperties(c,vo);
- vos.add(vo);
+ public R getCityTreeByProvinceCode(Integer provinceAdcode) {
+ List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
+ List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(null);
+ List<ComMngDistrictDO> districtDOS = comMngDistrictDAO.selectList(null);
+ List<ComMngAreaVO> vos = new ArrayList<>();
+ provinceDOS.forEach(p -> {
+ ComMngAreaVO pvo = new ComMngAreaVO(p.getProvinceAdcode(), p.getProvinceName());
+ vos.add(pvo);
+ List<ComMngCityDO> citys = cityDOS.stream().filter(city -> city.getProvinceAdcode().equals(p.getProvinceAdcode())).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);
+ });
+ });
});
return R.ok(vos);
}
--
Gitblit v1.7.1