|
|
@ -128,13 +128,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn |
|
|
|
public List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO) { |
|
|
|
List<AreaCodeDictResultDTO> 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<AreaCodeDictResultDTO> 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,6 +151,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn |
|
|
|
public List<AreaCodeDictResultDTO> disposeTree(AreaCodeDictFormDTO formDTO){ |
|
|
|
// 查询所有省市区
|
|
|
|
List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea(); |
|
|
|
log.info(areaCodeDTOS.size()+">>>>>>>>>>>>>>>>>>>>>>>>>>>>"); |
|
|
|
// 查询所有街道、社区
|
|
|
|
List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(formDTO.getRootAreaCode()); |
|
|
|
List<AreaCodeDictResultDTO> result = new ArrayList<>(); |
|
|
|