Browse Source

去掉redis

master
zhangyuan 3 years ago
parent
commit
89192bf6a3
  1. 11
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

11
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@ -128,13 +128,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
public List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO) { public List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO) {
List<AreaCodeDictResultDTO> tree = new ArrayList<>(); List<AreaCodeDictResultDTO> tree = new ArrayList<>();
String s = areaCodeRedis.get(AreaCodeConstant.SCREEN_TREE); String s = areaCodeRedis.get(AreaCodeConstant.SCREEN_TREE);
if (StringUtils.isNotBlank(s)){ // if (StringUtils.isNotBlank(s)){
tree = JSON.parseArray(s,AreaCodeDictResultDTO.class); // tree = JSON.parseArray(s,AreaCodeDictResultDTO.class);
}else { // }else {
List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = disposeTree(formDTO); List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = disposeTree(formDTO);
areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS); // areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS);
tree = areaCodeDictResultDTOS; tree = areaCodeDictResultDTOS;
} // }
if (StringUtils.isBlank(formDTO.getRootAreaCode())){ if (StringUtils.isBlank(formDTO.getRootAreaCode())){
return tree; return tree;
} }
@ -151,6 +151,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
public List<AreaCodeDictResultDTO> disposeTree(AreaCodeDictFormDTO formDTO){ public List<AreaCodeDictResultDTO> disposeTree(AreaCodeDictFormDTO formDTO){
// 查询所有省市区 // 查询所有省市区
List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea(); List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea();
log.info(areaCodeDTOS.size()+">>>>>>>>>>>>>>>>>>>>>>>>>>>>");
// 查询所有街道、社区 // 查询所有街道、社区
List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(formDTO.getRootAreaCode()); List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(formDTO.getRootAreaCode());
List<AreaCodeDictResultDTO> result = new ArrayList<>(); List<AreaCodeDictResultDTO> result = new ArrayList<>();

Loading…
Cancel
Save