From 4e89be5fc51ed51d8f75423adf335ccd8f935709 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Feb 2021 09:31:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java index 641ce7cf78..eb9a658257 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java @@ -31,7 +31,6 @@ public class AreaCodeDictResultDTO implements Serializable { */ private List children; - @JsonIgnore private String parentCode; public AreaCodeDictResultDTO() { From cb1ef62f8fe8982920ded8aee2ef022f4ca2a096 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Feb 2021 10:47:19 +0800 Subject: [PATCH 2/3] parentCode --- .../main/java/com/epmet/service/impl/AreaCodeServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index b511cab2c0..029d835475 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -342,6 +342,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl threeSort = threeResult.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList()); @@ -393,6 +394,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl fiveSort = fiveResult.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList()); From 88e4b342982ca395261eb5c83b0bb62f15b99cd1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 Feb 2021 13:19:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=BF=94=E5=9B=9EparentCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/AreaCodeServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index 029d835475..9b67de52a2 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -21,11 +21,11 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.constant.AreaCodeConstant; import com.epmet.dao.AreaCodeChildDao; import com.epmet.dao.AreaCodeDao; @@ -43,7 +43,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -342,7 +341,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl threeSort = threeResult.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList()); @@ -361,6 +361,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl citySort = cityOnceResult.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList()); dto.setChildren(citySort); + //一级行政地区parent_code设置为0 + dto.setParentCode("0"); result.add(dto); }); List collect = result.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList()); @@ -379,8 +381,10 @@ public class AreaCodeServiceImpl extends BaseServiceImpl fourResult = new ArrayList<>(); // 街道-社区 Map> groupByLevel = areaCodeChildDTOS.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getLevel)); + //社区 List levelFive = groupByLevel.get(NumConstant.FIVE); Map> groupByPCode = levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode)); + //街道 List levelFour = groupByLevel.get(NumConstant.FOUR); levelFour.forEach(four -> { AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO();