From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/service/all/PermsService.java |   51 ++++++++++++++++++++-------------------------------
 1 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/lf/server/service/all/PermsService.java b/src/main/java/com/lf/server/service/all/PermsService.java
index 046e8b2..5cb1c97 100644
--- a/src/main/java/com/lf/server/service/all/PermsService.java
+++ b/src/main/java/com/lf/server/service/all/PermsService.java
@@ -1,11 +1,12 @@
 package com.lf.server.service.all;
 
 import com.lf.server.entity.all.*;
-import com.lf.server.helper.StringHelper;
+import com.lf.server.entity.sys.MenuEntity;
 import com.lf.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;
 
@@ -15,18 +16,14 @@
  */
 @Service
 public class PermsService implements PermsMapper {
-    @Autowired
+    @Resource
     PermsMapper permsMapper;
 
-    @Autowired
+    @Resource
     RedisService redisService;
 
     @Override
     public List<ResAuthEntity> selectRes(String uid) {
-        if (StringHelper.isEmpty(uid)) {
-            return null;
-        }
-
         String key = RedisCacheKey.permsResKey(uid);
         Object obj = redisService.get(key);
         if (obj instanceof List<?>) {
@@ -43,10 +40,6 @@
 
     @Override
     public List<MenusAuthEntity> selectMenus(String uid) {
-        if (StringHelper.isEmpty(uid)) {
-            return null;
-        }
-
         String key = RedisCacheKey.permsMenusKey(uid);
         Object obj = redisService.get(key);
         if (obj instanceof List<?>) {
@@ -63,10 +56,6 @@
 
     @Override
     public List<String> selectPerms(String uid) {
-        if (StringHelper.isEmpty(uid)) {
-            return null;
-        }
-
         String key = RedisCacheKey.permsPermsKey(uid);
         Object obj = redisService.get(key);
         if (obj instanceof List<?>) {
@@ -83,10 +72,6 @@
 
     @Override
     public List<PermsAuthEntity> selectPermsEntity(String uid) {
-        if (StringHelper.isEmpty(uid)) {
-            return null;
-        }
-
         String key = RedisCacheKey.permsPermsEntityKey(uid);
         Object obj = redisService.get(key);
         if (obj instanceof List<?>) {
@@ -101,23 +86,27 @@
         return list;
     }
 
-    public void clearResCache() {
-        clearCache(RedisCacheKey.permsResKey(""));
+    @Override
+    public List<Integer> selectRoles(String uid) {
+        return permsMapper.selectRoles(uid);
     }
 
+    @Override
+    public List<MenuEntity> selectMenuRecursive(int id, String uid) {
+        return permsMapper.selectMenuRecursive(id, uid);
+    }
+
+    /**
+     * 娓呴櫎鎺堟潈缂撳瓨
+     */
     public void clearPermsCache() {
-        clearCache(RedisCacheKey.permsMenusKey(""));
-        clearCache(RedisCacheKey.permsPermsKey(""));
-        clearCache(RedisCacheKey.permsPermsEntityKey(""));
+        redisService.clearKeys(RedisCacheKey.permsRootKey());
     }
 
+    /**
+     * 娓呴櫎鎵�鏈夌紦瀛�
+     */
     public void clearAllCache() {
-        clearCache(RedisCacheKey.permsRootKey());
-    }
-
-    protected void clearCache(String key) {
-        if (redisService.hasKey(key)) {
-            redisService.clearKeys(key);
-        }
+        redisService.clearAll();
     }
 }

--
Gitblit v1.9.3