Merge remote-tracking branch 'remotes/市北/master' into prod

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

@@ -744,4 +744,7 @@ public class RedisKeys {
 		return rootPrefix.concat("temporary:").concat("temporaryResult:").concat(customerId).concat(":").concat(userId);
 	}
 
+	public static String getCustomerMenuList(String customerId, Integer type) {
+		return rootPrefix.concat("oper:access:nav:customerId:").concat(customerId)+type;
+	}
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovMenuRedis.java

@@ -71,4 +71,13 @@ public class GovMenuRedis {
         return (Set<String>)redisUtils.get(key);
     }
 
-}
+    public void setCustomerMenuList(String customerId, Integer type, List<GovMenuDTO> govMenuDTOS) {
+        String key = RedisKeys.getCustomerMenuList(customerId, type);
+        redisUtils.set(key,govMenuDTOS,RedisUtils.DEFAULT_EXPIRE);
+    }
+
+    public List<GovMenuDTO> getCustomerMenuList(String customerId, Integer type) {
+        String key = RedisKeys.getCustomerMenuList(customerId, type);
+        return (List<GovMenuDTO>)redisUtils.get(key);
+    }
+}

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java

@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -208,9 +209,15 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
      * @Date 15:51 2021-03-16
      **/
     private List<GovMenuDTO> getCustomerMenuList(String customerId, Integer type) {
+        List<GovMenuDTO> govMenuDTOS = govMenuRedis.getCustomerMenuList(customerId,type);
+        if (!CollectionUtils.isEmpty(govMenuDTOS)){
+            return  govMenuDTOS;
+        }
         List<GovMenuEntity> menuList = baseDao.getCustomerMenuList(customerId, type, HttpContextUtils.getLanguage());
         List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
-        return TreeUtils.buildTree(dtoList);
+        govMenuDTOS = TreeUtils.buildTree(dtoList);
+        govMenuRedis.setCustomerMenuList(customerId,type,govMenuDTOS);
+        return govMenuDTOS;
     }
 
     @Override