diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java index 7fb844a8f9..7bf4e537f8 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java @@ -99,19 +99,6 @@ public class AreaCodeController { return new Result>().ok(areaCodeService.areaCodeDictTreePlus(formDTO)); } - /** - * 行政编码查询 - * - * @param formDTO - * @return com.epmet.commons.tools.utils.Result> - * @author zhy - * @date 2022/7/6 10:28 - */ - @PostMapping("areacodedicttreenew") - public Result> areaCodeDictTreeNew(@RequestBody AreaCodeDictFormDTO formDTO) { - return new Result>().ok(areaCodeService.areaCodeDictTree(formDTO)); - } - /** * @param formDTO * @author yinzuomei diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java index baac590da6..e452332fea 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java @@ -99,22 +99,14 @@ public interface AreaCodeService extends BaseService { */ void delete(String[] ids); - /** - * 行政编码查询 - * - * @param formDTO - * @return com.epmet.commons.tools.utils.Result> - * @author zhy - * @date 2022/7/6 10:28 - */ - List areaCodeDictTree(AreaCodeDictFormDTO formDTO); - /** * @Description 行政地区编码查询 * @Param formDTO * @author zxc * @date 2021/1/7 下午1:41 */ + List areaCodeDictTree(AreaCodeDictFormDTO formDTO); + List areaCodeDictTreePlus(AreaCodeDictFormDTO formDTO); /** 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 a414b229aa..4d873b333e 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 @@ -124,17 +124,23 @@ public class AreaCodeServiceImpl extends BaseServiceImpl areaCodeDictTree(AreaCodeDictFormDTO formDTO) { List tree = new ArrayList<>(); String s = areaCodeRedis.get(AreaCodeConstant.SCREEN_TREE); -// if (StringUtils.isNotBlank(s)){ -// tree = JSON.parseArray(s,AreaCodeDictResultDTO.class); -// }else { + if (StringUtils.isNotBlank(s)){ + tree = JSON.parseArray(s,AreaCodeDictResultDTO.class); + }else { List areaCodeDictResultDTOS = disposeTree(formDTO); -// areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS); + areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS); tree = areaCodeDictResultDTOS; -// } + } if (StringUtils.isBlank(formDTO.getRootAreaCode())){ return tree; } @@ -151,7 +157,6 @@ public class AreaCodeServiceImpl extends BaseServiceImpl disposeTree(AreaCodeDictFormDTO formDTO){ // 查询所有省市区 List areaCodeDTOS = baseDao.selectAllArea(); - log.info(areaCodeDTOS.size()+">>>>>>>>>>>>>>>>>>>>>>>>>>>>"); // 查询所有街道、社区 List areaCodeChildDTOS = childDao.selectAllChild(formDTO.getRootAreaCode()); List result = new ArrayList<>();