将一个文件多个类拆分成一个文件一个类

app/Http/Controllers/ActionBarController.php

@@ -66,28 +66,3 @@ class ActionBarController extends Controller
         return "success";
     }
 }
-
-
-// 这个class的方法需要在中间件里加上权限判断，管理员才能执行
-class UserActionBar extends Controller
-{
-    public function AddUserActionBar(Request $request)
-    {
-        $uid = $request->input("uid");
-        $barId = $request->input("barId");
-
-        $userActionBar = new Models\UserActionBar();
-        $userActionBar->AddUserActionBar($uid, $barId);
-        return "success";
-    }
-
-    public function RemoveActionBar(Request $request)
-    {
-        $uid = $request->input("uid");
-        $barId = $request->input("barId");
-
-        $userActionBar = new Models\UserActionBar();
-        $userActionBar->RemoveUserActionBar($uid, $barId);
-        return "success";
-    }
-}

app/Http/Controllers/GroupController.php

@@ -45,26 +45,3 @@ class GroupController extends Controller
         return "success";
     }
 }
-
-class GroupUserController extends Controller
-{
-    public function GroupAddUser(Request $request)
-    {
-        $gid = $request->input("gid");
-        $uid = $request->input("uid");
-
-        $groupUser = new Models\GroupUser();
-        $groupUser->GroupAddUser($gid,$uid);
-        return "success";
-    }
-
-    public function GroupRemoveUser(Request $request)
-    {
-        $gid = $request->input("gid");
-        $uid = $request->input("uid");
-
-        $groupUser = new Models\GroupUser();
-        $groupUser->GroupRemoveUser($gid,$uid);
-        return "success";
-    }
-}

app/Http/Controllers/GroupUserController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models;
+use Illuminate\Http\Request;
+
+class GroupUserController extends Controller
+{
+    public function GroupAddUser(Request $request)
+    {
+        $gid = $request->input("gid");
+        $uid = $request->input("uid");
+
+        $groupUser = new Models\GroupUser();
+        $groupUser->GroupAddUser($gid,$uid);
+        return "success";
+    }
+
+    public function GroupRemoveUser(Request $request)
+    {
+        $gid = $request->input("gid");
+        $uid = $request->input("uid");
+
+        $groupUser = new Models\GroupUser();
+        $groupUser->GroupRemoveUser($gid,$uid);
+        return "success";
+    }
+}

app/Http/Controllers/PermissionController.php

@@ -35,7 +35,7 @@ class PermissionController extends Controller
         }
 
         // 有权分配
-        $userActionBar = new Models\UserActionBar();
+        $userActionBar = new Models\UserActionBarController();
         $userActionBar->AddUserActionBar($uid, $barIds);
         return "success";
     }

app/Http/Controllers/UserActionBarController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models;
+use Illuminate\Http\Request;
+
+// 这个class的方法需要在中间件里加上权限判断，管理员才能执行
+class UserActionBarController extends Controller
+{
+    public function AddUserActionBar(Request $request)
+    {
+        $uid = $request->input("uid");
+        $barId = $request->input("barId");
+
+        $userActionBar = new Models\UserActionBar();
+        $userActionBar->AddUserActionBar($uid, $barId);
+        return "success";
+    }
+
+    public function RemoveActionBar(Request $request)
+    {
+        $uid = $request->input("uid");
+        $barId = $request->input("barId");
+
+        $userActionBar = new Models\UserActionBar();
+        $userActionBar->RemoveUserActionBar($uid, $barId);
+        return "success";
+    }
+}

app/Models/ActionBar.php

@@ -135,7 +135,7 @@ class ActionBar extends Model
         $uid = $params["uid"];
 
         // 收集当前用户有权限的bar_id
-        $userActionBar = new UserActionBar();
+        $userActionBar = new UserActionBarController();
         $bar_ids = $userActionBar->ListActionBarIds($uid);
         if (count($bar_ids) == 0) {
             return [];
@@ -151,74 +151,4 @@ class ActionBar extends Model
     }
 }
 
-class UserActionBar extends Model
-{
-    protected $table = "user_action_bars";
-    public $timestamps = false;
-
-    public function AddUserActionBar($uid, $barId)
-    {
-        if ($uid == "") {
-            return "empty user id";
-        }
-        if ($barId == "") {
-            return "empty action bar id";
-        }
-
-        //INSERT INTO demo_in(a,b,c) SELECT 123, 2, 4 FROM DUAL WHERE NOT EXISTS(SELECT c FROM demo_in WHERE c = 4);
-        $sql = sprintf("insert into user_action_bars(user_id, bar_id) 
-                                    select ?, ? from temp_uab 
-                                    where not exists(
-                                    select id from user_action_bars
-                                    where user_id = ? and bar_id = ? and is_del = false);");
-
-        $result = DB::insert($sql, [$uid, $barId, $uid, $barId]);
-        Log::debug("AddUserActionBar " . $result);
-        return "success";
-    }
-
-    public function RemoveUserActionBar($uid, $barId)
-    {
-        if ($uid == "") {
-            return "empty user id";
-        }
-        if ($barId == "") {
-            return "empty action bar id";
-        }
-
-        $data = $this->where("user_id", $uid)
-            ->where("bar_id", $barId)
-            ->where("is_del", false)
-            ->first();
-        if (!$data) {
-            return "nothing to remove";
-        }
-        $this->is_del = true;
-        $this->where("user_id", $uid)
-            ->where("bar_id", $barId)
-            ->where("is_del", false)
-            ->update(["is_del" => true]);
-        return "success";
-    }
 
-    /**
-     * @param $uid
-     * @return array
-     */
-    public function ListActionBarIds($uid)
-    {
-        $bars = $this->select("bar_id")
-            ->where("user_id", $uid)
-            ->where("status", "normal")
-            ->where("is_del", false)
-            ->get();
-        if (count($bars) == 0) {
-            return [];
-        }
-        $bar_ids = [];
-        foreach ($bar_ids as $bar_id) {
-            array_push($bar_ids, $bar_id->bar_id);
-        }
-        return $bar_ids;
-    }
-}

app/Models/Group.php

@@ -97,68 +97,3 @@ class Group extends Model
         return $result;
     }
 }
-
-
-class GroupUser extends Model
-{
-    protected $table = "group_user";
-    public $timestamps = false;
-
-
-    /**
-     * todo
-     * 这里需要分页,也可能需要根据群组的状态排序，后面再处理
-     * 列出用户相关的群组
-     *
-     * @param $uid
-     * @return array
-     */
-    public function ListGroupIds($uid)
-    {
-        $groups = $this->select("group_id")
-            ->where("user_id", $uid)
-            ->where("is_del", false)
-            ->all();
-        $group_ids = [];
-        foreach ($groups as $group) {
-            array_push($group_ids, $group->group_id);
-        }
-        return $group_ids;
-    }
-
-    public function GroupAddUser($gid, $uid)
-    {
-        if ($gid == "") {
-            return "empty group id";
-        }
-        if ($uid == "") {
-            return "empty user id";
-        }
-
-        $this->group_id = $gid;
-        $this->user_id = $uid;
-        $this->status = "status";
-
-        $this->save();
-    }
-
-    public function GroupRemoveUser($gid, $uid)
-    {
-        if ($gid == "") {
-            return "empty group id";
-        }
-        if ($uid == "") {
-            return "empty user id";
-        }
-//        $this->group_id = $gid;
-//        $this->user_id = $uid;
-
-        $this->where("group_id", $gid)
-            ->where("user_id", $uid)
-            ->where("is_del", false)
-            ->update(["is_del" => true]);
-        return "success";
-    }
-
-
-}

app/Models/GroupUser.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class GroupUser extends Model
+{
+    protected $table = "group_user";
+    public $timestamps = false;
+
+
+    /**
+     * todo
+     * 这里需要分页,也可能需要根据群组的状态排序，后面再处理
+     * 列出用户相关的群组
+     *
+     * @param $uid
+     * @return array
+     */
+    public function ListGroupIds($uid)
+    {
+        $groups = $this->select("group_id")
+            ->where("user_id", $uid)
+            ->where("is_del", false)
+            ->all();
+        $group_ids = [];
+        foreach ($groups as $group) {
+            array_push($group_ids, $group->group_id);
+        }
+        return $group_ids;
+    }
+
+    public function GroupAddUser($gid, $uid)
+    {
+        if ($gid == "") {
+            return "empty group id";
+        }
+        if ($uid == "") {
+            return "empty user id";
+        }
+
+        $this->group_id = $gid;
+        $this->user_id = $uid;
+        $this->status = "status";
+
+        $this->save();
+    }
+
+    public function GroupRemoveUser($gid, $uid)
+    {
+        if ($gid == "") {
+            return "empty group id";
+        }
+        if ($uid == "") {
+            return "empty user id";
+        }
+//        $this->group_id = $gid;
+//        $this->user_id = $uid;
+
+        $this->where("group_id", $gid)
+            ->where("user_id", $uid)
+            ->where("is_del", false)
+            ->update(["is_del" => true]);
+        return "success";
+    }
+
+
+}

app/Models/User.php

@@ -45,45 +45,3 @@ class User extends Model
     }
 }
 
-class UserRole extends Model
-{
-
-    protected $table = "user_roles";
-    public $timestamps = false;
-
-    public function AssignRoles($uid, array $roles)
-    {
-        $checkData = $this->select("id")
-            ->where("user_id", $uid)
-            ->where("is_del", false)
-            ->first;
-
-        $r = 0;
-        foreach ($roles as $role) {
-            $r = $r & $role;
-        }
-
-        if (!$checkData) {
-            // 插入新数据
-            $this->user_id = $uid;
-            $this->roles = $r;
-            $this->save();
-        } else {
-            // 更新旧角色
-            $this->roles = $r;
-            $this->save();
-        }
-        return"success";
-    }
-
-    public function LoadRoleByUid($uid)
-    {
-        $role = $this->select("user_id", "role_id", "status")
-            ->where("user_id", $uid)
-            ->where("is_del", false)
-            ->first();
-
-        return $role;
-    }
-}
-

app/Models/UserActionBar.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class UserActionBar extends Model
+{
+    protected $table = "user_action_bars";
+    public $timestamps = false;
+
+    public function AddUserActionBar($uid, $barId)
+    {
+        if ($uid == "") {
+            return "empty user id";
+        }
+        if ($barId == "") {
+            return "empty action bar id";
+        }
+
+        //INSERT INTO demo_in(a,b,c) SELECT 123, 2, 4 FROM DUAL WHERE NOT EXISTS(SELECT c FROM demo_in WHERE c = 4);
+        $sql = sprintf("insert into user_action_bars(user_id, bar_id) 
+                                    select ?, ? from temp_uab 
+                                    where not exists(
+                                    select id from user_action_bars
+                                    where user_id = ? and bar_id = ? and is_del = false);");
+
+        $result = DB::insert($sql, [$uid, $barId, $uid, $barId]);
+        Log::debug("AddUserActionBar " . $result);
+        return "success";
+    }
+
+    public function RemoveUserActionBar($uid, $barId)
+    {
+        if ($uid == "") {
+            return "empty user id";
+        }
+        if ($barId == "") {
+            return "empty action bar id";
+        }
+
+        $data = $this->where("user_id", $uid)
+            ->where("bar_id", $barId)
+            ->where("is_del", false)
+            ->first();
+        if (!$data) {
+            return "nothing to remove";
+        }
+        $this->is_del = true;
+        $this->where("user_id", $uid)
+            ->where("bar_id", $barId)
+            ->where("is_del", false)
+            ->update(["is_del" => true]);
+        return "success";
+    }
+
+    /**
+     * @param $uid
+     * @return array
+     */
+    public function ListActionBarIds($uid)
+    {
+        $bars = $this->select("bar_id")
+            ->where("user_id", $uid)
+            ->where("status", "normal")
+            ->where("is_del", false)
+            ->get();
+        if (count($bars) == 0) {
+            return [];
+        }
+        $bar_ids = [];
+        foreach ($bar_ids as $bar_id) {
+            array_push($bar_ids, $bar_id->bar_id);
+        }
+        return $bar_ids;
+    }
+}

app/Models/UserRole.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class UserRole extends Model
+{
+
+    protected $table = "user_roles";
+    public $timestamps = false;
+
+    public function AssignRoles($uid, array $roles)
+    {
+        $checkData = $this->select("id")
+            ->where("user_id", $uid)
+            ->where("is_del", false)
+            ->first;
+
+        $r = 0;
+        foreach ($roles as $role) {
+            $r = $r & $role;
+        }
+
+        if (!$checkData) {
+            // 插入新数据
+            $this->user_id = $uid;
+            $this->roles = $r;
+            $this->save();
+        } else {
+            // 更新旧角色
+            $this->roles = $r;
+            $this->save();
+        }
+        return"success";
+    }
+
+    public function LoadRoleByUid($uid)
+    {
+        $role = $this->select("user_id", "role_id", "status")
+            ->where("user_id", $uid)
+            ->where("is_del", false)
+            ->first();
+
+        return $role;
+    }
+}