From 796b44ea813a1133beae4f3a67f1c0263510c0c7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 17 十一月 2024 09:45:07 +0800
Subject: [PATCH] 1

---
 src/main/java/com/moon/server/service/all/PermsService.java |   49 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/moon/server/service/all/PermsService.java b/src/main/java/com/moon/server/service/all/PermsService.java
index c8f089b..e857200 100644
--- a/src/main/java/com/moon/server/service/all/PermsService.java
+++ b/src/main/java/com/moon/server/service/all/PermsService.java
@@ -2,34 +2,41 @@
 
 import com.moon.server.entity.all.*;
 import com.moon.server.entity.sys.MenuEntity;
+import com.moon.server.entity.sys.ResEntity;
 import com.moon.server.mapper.all.PermsMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-/**
- * 鎺堟潈鏈嶅姟
- * @author WWW
- */
 @Service
+@SuppressWarnings("ALL")
 public class PermsService implements PermsMapper {
-    @Autowired
+    @Resource
     PermsMapper permsMapper;
 
-    @Autowired
+    @Resource
     RedisService redisService;
 
     @Override
-    public List<ResAuthEntity> selectRes(String uid) {
+    public List<ResEntity> selectRes(String uid) {
+        return selectResByUid(uid, false);
+    }
+
+    @Override
+    public List<ResEntity> selectAllRes() {
+        return selectResByUid(StaticData.ADMIN, true);
+    }
+
+    private List<ResEntity> selectResByUid(String uid, boolean isAll) {
         String key = RedisCacheKey.permsResKey(uid);
         Object obj = redisService.get(key);
         if (obj instanceof List<?>) {
-            return (List<ResAuthEntity>) obj;
+            return (List<ResEntity>) obj;
         }
 
-        List<ResAuthEntity> list = permsMapper.selectRes(uid);
+        List<ResEntity> list = isAll ? permsMapper.selectAllRes() : permsMapper.selectRes(uid);
         if (list != null && list.size() > 0) {
             redisService.put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
         }
@@ -38,14 +45,23 @@
     }
 
     @Override
-    public List<Integer> selectResList(String uid) {
-        String key = RedisCacheKey.permsResListKey(uid);
+    public List<String> selectTabs(String uid) {
+        return selectTabsByUid(uid, false);
+    }
+
+    @Override
+    public List<String> selectAllTabs() {
+        return selectTabsByUid(StaticData.ADMIN, true);
+    }
+
+    private List<String> selectTabsByUid(String uid, boolean isAll) {
+        String key = RedisCacheKey.permsGeoTabKey(uid);
         Object obj = redisService.get(key);
         if (obj instanceof List<?>) {
-            return (List<Integer>) obj;
+            return (List<String>) obj;
         }
 
-        List<Integer> list = permsMapper.selectResList(uid);
+        List<String> list = isAll ? permsMapper.selectAllTabs() : permsMapper.selectTabs(uid);
         if (list != null && list.size() > 0) {
             redisService.put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
         }
@@ -113,7 +129,10 @@
 
     public void clearResCache() {
         redisService.clearKeys(RedisCacheKey.permsResKey(""));
-        redisService.clearKeys(RedisCacheKey.permsResListKey(""));
+    }
+
+    public void clearLayerCache() {
+        redisService.clearKeys(RedisCacheKey.permsLayerKey(""));
     }
 
     public void clearPermsCache() {

--
Gitblit v1.9.3