From 388e731e4ce4c19e308c7021073059e622cdbd9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=90?= <419641032@qq.com>
Date: Tue, 8 Sep 2020 11:41:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9F=8E=E5=B8=82=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SystemCityAsyncServiceImpl.java      |  2 +-
 .../service/impl/SystemCityServiceImpl.java   | 23 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityAsyncServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityAsyncServiceImpl.java
index 80f6cf0c..d46efff6 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityAsyncServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityAsyncServiceImpl.java
@@ -91,7 +91,7 @@ public class SystemCityAsyncServiceImpl extends ServiceImpl<SystemCityDao, Syste
         lambdaQueryWrapper.in(SystemCity::getIsShow, true);
         List<SystemCity> systemCityList = dao.selectList(lambdaQueryWrapper);
         if(systemCityList != null && systemCityList.size() > 0){
-            redisUtil.hmSet(Constants.CITY_LIST, pid, systemCityList);
+            redisUtil.hmSet(Constants.CITY_LIST, pid.toString(), systemCityList);
         }
     }
 
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
index 701395a8..b7710e1d 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
@@ -48,12 +48,31 @@ public class SystemCityServiceImpl extends ServiceImpl<SystemCityDao, SystemCity
      */
     @Override
     public Object getList(SystemCitySearchRequest request) {
-        if(redisUtil.hmGet(Constants.CITY_LIST, request.getParentId()) == null){
+        if(redisUtil.hmGet(Constants.CITY_LIST, request.getParentId().toString()) == null){
             asyncRedis(request.getParentId());
         }
-        return redisUtil.hmGet(Constants.CITY_LIST, request.getParentId());
+        Object list = redisUtil.hmGet(Constants.CITY_LIST, request.getParentId().toString());
+        if(null == list){
+            //城市数据，异步同步到redis，第一次拿不到数据，去数据库读取
+            list = getList(request.getParentId());
+        }
+
+        return list;
     }
 
+    /**
+     * 根据父级id获取数据
+     * @param parentId integer parentId
+     * @author Mr.Zhang
+     * @since 2020-04-17
+     * @return Object
+     */
+    private Object getList(Integer parentId) {
+        LambdaQueryWrapper<SystemCity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SystemCity::getParentId, parentId);
+        lambdaQueryWrapper.in(SystemCity::getIsShow, true);
+        return dao.selectList(lambdaQueryWrapper);
+    }
     /**
      * 修改状态
      * @param id integer id