新增功能

2025-07-10 14:06:01 +08:00
parent f6323f2513
commit 43d673ad9c
20 changed files with 738 additions and 169 deletions
@@ -2,11 +2,17 @@

 namespace app\common\service;

-use app\common\model\User;
+use app\common\logic\PermLogic;
 use support\Cache;

 class PermService
 {
+    protected $logic;
+
+    public function __construct()
+    {
+        $this->logic = (new PermLogic());
+    }

    // 用户资源缓存key
    protected static function cacheKey(int $userId): string
@@ -17,7 +23,7 @@ class PermService
    /**
     * 获取用户所有资源（合并角色+直接分配），结果缓存
     */
-    public static function getUserResources(int $userId)
+    public function getUserResources(int $userId)
    {
        $cacheKey = self::cacheKey($userId);
        $cached   = Cache::get($cacheKey);
@@ -25,84 +31,37 @@ class PermService
            return $cached;
        }

-        $user = User::with(['roles.resources', 'resources'])->find($userId);
-        if (!$user) {
-            return collect();
-        }
+        // 调用 Logic 层获取资源
+        $resources = $this->logic->getUserResources($userId);
+        
+        // 缓存结果
+        Cache::set($cacheKey, $resources, 3600);

-        $all = collect();
-        foreach ($user->roles as $role) {
-            $all = $all->merge($role->resources);
-        }
-        $all = $all->merge($user->resources);
-        $unique = $all->unique('id')->values();
-
-        Cache::set($cacheKey, $unique, 3600);
-        return $unique;
+        return $resources;
    }

    /**
     * 构建目录/菜单树，节点包含权限与打开方式
     */
-    public static function getMenuTree(int $userId): array
+    public function getMenuTree(int $userId): array
    {
-        $resources = self::getUserResources($userId);
-        $menus = $resources
-            ->filter(fn($r) => in_array($r->type, ['directory','menu']))
-            ->values();
-        return self::buildTree($menus, $resources);
-    }
-
-    protected static function buildTree($nodes, $allResources, int $parentId = 0): array
-    {
-        $tree = [];
-        foreach ($nodes as $node) {
-            if ($node->parent_id !== $parentId) continue;
-
-            $children = self::buildTree($nodes, $allResources, $node->id);
-
-            $authList = $allResources
-                ->filter(fn($r) => $r->type === 'permission' && $r->parent_id === $node->id)
-                ->map(fn($r) => [
-                    'id'        => $r->id,
-                    'title'     => $r->name,
-                    'auth_mark' => $r->code,
-                ])->values()->all();
-
-            $tree[] = [
-                'id'       => $node->id,
-                'name'     => $node->name,
-                'path'     => $node->url,
-                'meta'     => [
-                    'title'     => $node->name,
-                    'icon'      => $node->icon,
-                    'keepAlive' => true,
-                    'authList'  => $authList,
-                    'openType'  => $node->open_type, // 'internal' | 'external' | 'iframe'
-                ],
-                'children' => $children,
-            ];
-        }
-        return $tree;
+        // 调用 Logic 层处理菜单构建
+        $resources = $this->getUserResources($userId);
+        return $this->logic->buildTree($resources);
    }

    /**
     * 获取用户所有权限code
     */
-    public static function getPermissionCodes(int $userId): array
+    public function getPermissionCodes(int $userId): array
    {
-        return self::getUserResources($userId)
-            ->filter(fn($res) => $res->type === 'permission')
-            ->pluck('code')
-            ->unique()
-            ->values()
-            ->all();
+        return $this->logic->getPermissionCodes($userId);
    }

    /**
     * 清除资源相关缓存
     */
-    public static function clearCache(int $userId): void
+    public function clearCache(int $userId): void
    {
        Cache::delete(self::cacheKey($userId));
    }
@@ -0,0 +1,109 @@
+<?php
+
+namespace app\common\service;
+
+use app\common\model\User;
+use support\Cache;
+
+class PermService_bak
+{
+
+    // 用户资源缓存key
+    protected static function cacheKey(int $userId): string
+    {
+        return "user_resources_{$userId}";
+    }
+
+    /**
+     * 获取用户所有资源（合并角色+直接分配），结果缓存
+     */
+    public static function getUserResources(int $userId)
+    {
+        $cacheKey = self::cacheKey($userId);
+        $cached   = Cache::get($cacheKey);
+        if ($cached !== null) {
+            return $cached;
+        }
+
+        $user = User::with(['roles.resources', 'resources'])->find($userId);
+        if (!$user) {
+            return collect();
+        }
+
+        $all = collect();
+        foreach ($user->roles as $role) {
+            $all = $all->merge($role->resources);
+        }
+        $all = $all->merge($user->resources);
+        $unique = $all->unique('id')->values();
+
+        Cache::set($cacheKey, $unique, 3600);
+        return $unique;
+    }
+
+    /**
+     * 构建目录/菜单树，节点包含权限与打开方式
+     */
+    public static function getMenuTree(int $userId): array
+    {
+        $resources = self::getUserResources($userId);
+        $menus = $resources
+            ->filter(fn($r) => in_array($r->type, ['directory','menu']))
+            ->values();
+        return self::buildTree($menus, $resources);
+    }
+
+    protected static function buildTree($nodes, $allResources, int $parentId = 0): array
+    {
+        $tree = [];
+        foreach ($nodes as $node) {
+            if ($node->parent_id !== $parentId) continue;
+
+            $children = self::buildTree($nodes, $allResources, $node->id);
+
+            $authList = $allResources
+                ->filter(fn($r) => $r->type === 'permission' && $r->parent_id === $node->id)
+                ->map(fn($r) => [
+                    'id'        => $r->id,
+                    'title'     => $r->name,
+                    'auth_mark' => $r->code,
+                ])->values()->all();
+
+            $tree[] = [
+                'id'       => $node->id,
+                'name'     => $node->name,
+                'path'     => $node->url,
+                'meta'     => [
+                    'title'     => $node->name,
+                    'icon'      => $node->icon,
+                    'keepAlive' => true,
+                    'authList'  => $authList,
+                    'openType'  => $node->open_type, // 'internal' | 'external' | 'iframe'
+                ],
+                'children' => $children,
+            ];
+        }
+        return $tree;
+    }
+
+    /**
+     * 获取用户所有权限code
+     */
+    public static function getPermissionCodes(int $userId): array
+    {
+        return self::getUserResources($userId)
+            ->filter(fn($res) => $res->type === 'permission')
+            ->pluck('code')
+            ->unique()
+            ->values()
+            ->all();
+    }
+
+    /**
+     * 清除资源相关缓存
+     */
+    public static function clearCache(int $userId): void
+    {
+        Cache::delete(self::cacheKey($userId));
+    }
+}
@@ -0,0 +1,55 @@
+<?php
+
+namespace app\common\service;
+
+use app\common\logic\RoleLogic;
+
+class RoleService
+{
+    protected $roleLogic;
+
+    public function __construct()
+    {
+        $this->roleLogic = (new RoleLogic());
+    }
+
+    /**
+     * 获取角色列表
+     */
+    public function getRoleList(array $params)
+    {
+        return $this->roleLogic->getRoleList($params);
+    }
+
+    /**
+     * 获取角色详情
+     */
+    public function getRoleDetail(int $roleId)
+    {
+        return $this->roleLogic->getRoleDetail($roleId);
+    }
+
+    /**
+     * 创建角色
+     */
+    public function createRole(array $data)
+    {
+        return $this->roleLogic->createRole($data);
+    }
+
+    /**
+     * 更新角色
+     */
+    public function updateRole(array $data)
+    {
+        return $this->roleLogic->updateRole($data);
+    }
+
+    /**
+     * 删除角色
+     */
+    public function deleteRole(int $roleId)
+    {
+        return $this->roleLogic->deleteRole($roleId);
+    }
+}
@@ -2,19 +2,39 @@

 namespace app\common\service;

-use app\model\User;
+use app\common\logic\UserLogic;

 class UserService
 {
-    public static function getInfo($userId)
+
+    protected $logic;
+
+    public function __construct()
    {
-        $user = User::with('roles')->find($userId);
-        if (!$user) return null;
+        $this->logic = (new UserLogic());
+    }
+
+    /**
+     * 获取用户信息（包括菜单和权限）
+     */
+    public function getUserInfo(int $uid)
+    {
+        $user = $this->logic->userInfo($uid);
+        $permService = new PermService();
+        $menuTree = $permService->getMenuTree($uid);
+        $permissionCodes = $permService->getPermissionCodes($uid);
        return [
-            'id' => $user->id,
-            'username' => $user->username,
-            'roles' => $user->roles->pluck('name')->toArray(),
-            // 可扩展其他字段
+            'user' => [
+                'id' => $user->id,
+                'name' => $user->name,
+                'avatar' => $user->avatar,
+                'phone' => $user->phone,
+                'email' => $user->email,
+                'status' => $user->status,
+                'roles' => $user->roles->pluck('name')
+            ],
+            'menu' => $menuTree, 
+            'permissions' => $permissionCodes
        ];
    }
-}
+}