调整权限返回

app/Http/Controllers/AdminPermissionController.php

@@ -27,6 +27,7 @@ class AdminPermissionController extends Controller
             $res[] = [
                 'id' => $permission->id,
                 'label' => $permission->name,
+                'slug'  => $permission->slug,
                 'children' => $this->formatPermissionsTreeToArray($permission->children ?? []),
             ];
         }

app/Http/Controllers/AuthController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\AdminUser;
+use App\Models\AdminPermission;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 
@@ -34,6 +35,12 @@ class AuthController extends Controller
     {
         $token = $user->createToken($name)->plainTextToken;
 
-        return $this->json(['token' => $token, 'info' => $user, 'permissions' => $user->permissionIds()]);
+        $permissionsQuery = AdminPermission::query();
+        if($user->id != 1){
+            $permissions = $permissionsQuery->whereIn('id', $user->permissionIds());
+        }
+        $permissions = $permissionsQuery->pluck('slug')->toArray();
+
+        return $this->json(['token' => $token, 'info' => $user, 'permissions' => $user->permissionIds(), 'permissions_slug'=>$permissions]);
     }
 }

app/Http/Controllers/UserController.php

@@ -5,14 +5,21 @@ namespace App\Http\Controllers;
 use App\Http\Requestes\RestPasswordRequest;
 use App\Services\OperationLogService;
 use App\Enums\OperationType;
+use App\Models\AdminPermission;
 
 class UserController extends Controller
 {
     public function info()
     {
         $user = auth('api')->user();
+        
+        $permissionsQuery = AdminPermission::query();
+        if($user->id != 1){
+            $permissions = $permissionsQuery->whereIn('id', $user->permissionIds());
+        }
+        $permissions = $permissionsQuery->pluck('slug')->toArray();
 
-        return $this->json(['info' => $user, 'permissions' => $user->permissionIds()]);
+        return $this->json(['info' => $user, 'permissions' => $user->permissionIds(), 'permissions_slug'=>$permissions]);
     }
 
     public function resetPwd(RestPasswordRequest $request)

database/seeders/EndpointPermissionSeeder.php

@@ -23,35 +23,40 @@ class EndpointPermissionSeeder extends Seeder
                     'water' => ['name' => '水质监控', 'curd' => ['index'], 'children' => ['setting' => '设置', 'setting_edit' => '更新设置']],
                 ]],
                 'base_data' => ['name' => '基础数据管理', 'curd' => false, 'children' => [
-                    'citydata_statistics' => ['name' => '全市基础数据', 'curd' => ['index', 'edit']],
-                    //全市基础数据
-                    'agricultural_basic' => ['name' => '基地数据',  'curd' => true],
-                    'town_street' => ['name' => '城镇数据',  'curd' => ['index', 'edit']],
+                    'citydata_statistics' => ['name' => '全市基础数据', 'curd' => false, 'children'=>[
+                        'town_street' => ['name' => '城镇数据',  'curd' => ['index', 'edit'], 'children'=>['base_statistics'=>'市基础数据','base_statistics_edit'=>'修改市基础数据']],
+                        //全市基础数据
+                        'agricultural_basic' => ['name' => '基地数据',  'curd' => true],
+                    ]],
                     //农作物数据
-                    'crops' => ['name' => '基地农作物', 'curd' => true],
-                    'town_crops' => ['name' => '镇街农作物', 'curd' => true],
+                    'citydata_crops' =>['name'=>'农作物数据','curd'=>false, 'children'=>[
+                        'town_crops' => ['name' => '城镇农作物', 'curd' => true],
+                        'crops' => ['name' => '基地农作物', 'curd' => true],
+                    ]],
                     //农作物产量
-                    'crops_output' => ['name' => '基地产量', 'curd' => true],
-                    'town_crops_output' => ['name' => '镇街产量', 'curd' => true],
-                    // 'crops_flow' => ['name' => '农产品流向', 'curd' => true],
-                    // 'crops_price' => ['name' => '农产品价格走势', 'curd' => ['index'], 'children' => ['is_enable' => '自动监测开关']],
-                ]],
-                'industry_data' => ['name' => '重点产业', 'curd' => false, 'children' => [
-                    'rice_shrimp_prices' => ['name' => '稻虾价格',  'curd' => true],
-                    'rice_shrimp_weekly_prices' => ['name' => '稻虾每周价格',  'curd' => true],
-                    'rice_shrimp_industries' => ['name' => '稻虾产业',  'curd' => true],
-                    'rice_shrimp_flows' => ['name' => '稻虾走向',  'curd' => true],
-                    'materiels' => ['name' => '大宗物资',  'curd' => true],
+                    'citydata_output'=>['name'=>'农作物产量','curd'=>false, 'children'=>[
+                        'town_crops_output' => ['name' => '城镇产量', 'curd' => true],
+                        'crops_output' => ['name' => '基地产量', 'curd' => true],
+                    ]],
+                    'industry_data' => ['name' => '重点产业', 'curd' => false, 'children' => [
+                        'rice_shrimp_prices' => ['name' => '稻虾价格',  'curd' => true],
+                        'rice_shrimp_weekly_prices' => ['name' => '稻虾每周价格',  'curd' => true],
+                        'rice_shrimp_industries' => ['name' => '稻虾产业',  'curd' => true],
+                        'rice_shrimp_flows' => ['name' => '稻虾走向',  'curd' => true],
+                        'materiels' => ['name' => '大宗物资',  'curd' => true],
+                    ]],
                 ]],
+                
                 'device_data' => ['name' => '设备管理', 'curd' => false, 'children' => [
                     'device' => ['name' => '设备管理', 'curd' => true],
+                    'warnings' => ['name' => '警报明细', 'curd' => false,'children'=>['mark'=>'标记']],
                 ]],
                 'manage' => ['name' => '系统管理', 'curd' => false, 'children' => [
-                    'admin_users' => ['name' => '管理员管理', 'curd' => true, 'children' => [
+                    'admin_roles' => ['name' => '角色管理', 'curd' => true],
+                    'admin_users' => ['name' => '账号管理', 'curd' => true, 'children' => [
                         'edit_password' => '修改密码', 'enable' => '启用/禁用',
                     ]],
-                    'admin_roles' => ['name' => '角色管理', 'curd' => true],
-                    'operation_log' => ['name' => '操作日志', 'curd' => ['index']],
+                    'operation_log' => ['name' => '系统日志', 'curd' => ['index']],
                     'friend_links' => ['name' => '友情链接', 'curd' => true]
                 ]],
             ]]