Merge branch 'develop'

2025-08-14 20:08:57 +08:00
parent f4a2966b1e
commit 39e840bba8
49 changed files with 2240 additions and 522 deletions
@@ -2,82 +2,128 @@

 namespace app\common\service;

-use app\model\User;
-use app\model\Role;
-use app\model\Resource;
+use app\common\logic\ResourceLogic;
+use app\common\validate\ResourceValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\Resource;
+use app\common\utils\Tree;
+use support\Request;

 class ResourceService
 {
-    /**
-     * 获取用户可见菜单树
-     */
-    public static function getMenuTreeForUser($userId)
-    {
-        $menuList = self::getUserMenus($userId);
-        // 转树
-        return self::buildTree($menuList);
-    }
+
+    use CrudServiceTrait;

    /**
-     * 获取用户所有有权限的菜单资源（type=menu）
+     * 指定当前要操作的模型
     */
-    public static function getUserMenus($userId)
-    {
-        $user = User::with('roles.resources')->find($userId);
-        if (!$user) return [];
-        // 合并所有角色下的菜单资源
-        $allMenus = [];
-        foreach ($user->roles as $role) {
-            foreach ($role->resources as $res) {
-                if ($res->type === 'menu') {
-                    $allMenus[$res->id] = $res;
-                }
-            }
-        }
-        return array_values($allMenus); // 去重后返回
-    }
+    protected string $modelClass = Resource::class;

    /**
-     * 获取用户所有有权限的按钮/功能权限 code
+     * 验证器
     */
-    public static function getButtonPermissionCodesForUser($userId)
-    {
-        $user = User::with('roles.resources')->find($userId);
-        if (!$user) return [];
-        $codes = [];
-        foreach ($user->roles as $role) {
-            foreach ($role->resources as $res) {
-                if ($res->type === 'button' && $res->code) {
-                    $codes[$res->code] = true;
-                }
-            }
-        }
-        return array_keys($codes); // 去重后返回权限code数组
-    }
+    protected $validator = ResourceValidate::class;

    /**
-     * 递归构建菜单树
-     * @param Resource[] $list
-     * @param int $parentId
-     * @return array
+     * 获取验证器
     */
-    protected static function buildTree($list, $parentId = 0)
+    public function getValidator()
    {
-        $tree = [];
-        foreach ($list as $item) {
-            if ($item->parent_id == $parentId) {
-                $children = self::buildTree($list, $item->id);
-                $arr = [
-                    'id'    => $item->id,
-                    'name'  => $item->name,
-                    'path'  => $item->url,
-                    'icon'  => $item->icon ?? null,
-                    'code'  => $item->code,
-                    'children' => $children,
-                ];
-                $tree[] = $arr;
-            }
+        return  new $this->validator;
+    }
+
+
+    protected function buildQueryConfig(Request $request, string $scene = 'default'): array
+    {
+        $p = $request->all();
+        
+        $config = [];
+        $config['model'] = $this->modelClass;
+        switch ($scene) {
+            case 'default':
+                $config['where']['system_id'] = ['in', [0, $p['system_id']]];
+                $config['where']['status'] = 1;
+                $config['order']['sort'] = 'asc';
+                $config['order']['id'] = 'asc';
+                break;
+            case 'menuList':
+                $config['where']['status'] = 1;
+                $config['where']['type'] = ['!=', 'permission'];
+                $config['order']['sort'] = 'asc';
+                $config['order']['id'] = 'asc';
+                break;
+            case 'menuTreeList':
+                $config['where']['status'] = 1;
+                $config['order']['sort'] = 'asc';
+                $config['order']['id'] = 'asc';
+                break;
+            case 'index':
+                $config['where']['status'] = 1;
+                $config['order']['sort'] = 'asc';
+                $config['order']['id'] = 'asc';
+                break;
+            case 'show':
+                $config['where']['id'] = $p['id'];
+                $config['where']['status'] = 1;
+                break;
+            case 'store':
+                break;
+            case 'update':
+                $config['where']['id'] = $p['id'];
+                break;
+            case 'destroy':
+                $config['where']['id'] = $p['id'];
+                break;
        }
-        return $tree;
+        
+        return $config;
+    }
+
+    public function serviceMenuList(Request $request)
+    {
+        $config = $this->buildQueryConfig($request, 'menuList');
+        $result = $this->logicListAll($config);
+        return $this->postProcess('MenuList', $result);
+    }
+
+    public function serviceMenuTreeList(Request $request)
+    {
+        $config = $this->buildQueryConfig($request, 'menuTreeList');
+        $result = (new ResourceLogic())->logicListAllResources($request, $config);
+        return $this->postProcess('MenuTreeList', $result);
+    }
+
+
+    protected function afterServiceListAll($data)
+    {
+        $data = Tree::buildMenuTreeWithReference($data->toArray());
+        return $data;
+    }
+
+    protected function afterServiceMenuList($data)
+    {
+        $data = Tree::buildMenuTree($data->toArray());
+        return $data;
+    }
+
+    protected function afterServiceMenuTreeList($data)
+    {
+        $data = Tree::buildMenuTree($data->toArray());
+        return $data;
+    }
+
+
+    public function beforeServiceStore($data, Request $request)
+    {
+        $data['parent_id'] = $data['parent_id'] != '' ? $data['parent_id'] : 0;
+        $data['system_id'] = $data['system_id'] != '' ? $data['system_id'] : 0;
+        return $data;
+    }
+
+    public function beforeServiceUpdate($data, Request $request)
+    {
+        $data['parent_id'] = $data['parent_id'] != '' ? $data['parent_id'] : 0;
+        $data['system_id'] = $data['system_id'] != '' ? $data['system_id'] : 0;
+        return $data;
    }
 }