Merge remote-tracking branch 'origin/develop' into release_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -753,4 +753,14 @@ public class RedisKeys {
 	public static String getCustomerMenuListPrefix() {
 		return rootPrefix.concat("oper:access:nav:customerId:");
 	}
+
+	/**
+	 * 如果是省列表：epmet:areacode:parentCode:0
+	 * 山东省的下一级：epmet:areacode:parentCode:37
+	 * @param areaCode
+	 * @return
+	 */
+	public static String getNextAreaCodeKey(String areaCode) {
+		return rootPrefix.concat("areaCode:parentCode:").concat(areaCode);
+	}
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/redis/AreaCodeRedis.java

@@ -19,9 +19,12 @@ package com.epmet.redis;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.dto.result.AreaCodeResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 大陆省市区地区码
  *
@@ -49,4 +52,12 @@ public class AreaCodeRedis {
         return null;
     }
 
+    public List<AreaCodeResultDTO> getNextAreaCodeKey(String key) {
+        List<AreaCodeResultDTO> list = (List<AreaCodeResultDTO>) redisUtils.get(key);
+        return list;
+    }
+
+    public void setNextAreaCodeKey(String key, List<AreaCodeResultDTO> list) {
+        redisUtils.set(key, list);
+    }
 }

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

@@ -29,6 +29,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.AreaCodeConstant;
 import com.epmet.dao.AreaCodeChildDao;
@@ -693,9 +694,20 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     @Override
     public List<AreaCodeResultDTO> nextArea(AreaCodeFormDTO formDTO) {
         if(StringUtils.isBlank(formDTO.getParentAreaCode())&&StringUtils.isBlank(formDTO.getParentLevel())){
-            return baseDao.selectProvince();
+            String pKey=RedisKeys.getNextAreaCodeKey(NumConstant.ZERO_STR);
+            List<AreaCodeResultDTO> list=areaCodeRedis.getNextAreaCodeKey(pKey);
+            if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)){
+                return list;
+            }
+            List<AreaCodeResultDTO> pList=baseDao.selectProvince();
+            areaCodeRedis.setNextAreaCodeKey(pKey,pList);
+            return pList;
+        }
+        String key=RedisKeys.getNextAreaCodeKey(formDTO.getParentAreaCode());
+        List<AreaCodeResultDTO> list=areaCodeRedis.getNextAreaCodeKey(key);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)){
+            return list;
         }
-        List<AreaCodeResultDTO> list=new ArrayList<>();
         switch (formDTO.getParentLevel()) {
             case AreaCodeConstant.PROVINCE:
                 list = baseDao.selectCity(formDTO.getParentAreaCode());
@@ -716,6 +728,9 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             default:
                 log.warn("parentLevel错误："+formDTO.getParentLevel());
         }
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)){
+            areaCodeRedis.setNextAreaCodeKey(key,list);
+        }
         return list;
     }