gx

liyuhang
app/Http/Controllers/Bside/BaseController.php
app/Http/Controllers/Bside/ProjectGroupController.php
app/Http/Controllers/Bside/ProjectRoleController.php
app/Http/Controllers/Bside/UserController.php
app/Http/Requests/Bside/ProjectGroupRequest.php
app/Models/Base.php
routes/bside.php
--- a/app/Http/Controllers/Bside/BaseController.php
查看文件 @36aab10
+++ b/app/Http/Controllers/Bside/BaseController.php
查看文件 @36aab10
@@ -16,7 +16,7 @@ class BaseController extends Controller
     protected $token = ''; //token
     protected $request = [];//助手函数
     protected $allCount = 0;//总条数
-    protected $p = 1;//当前页
+    protected $page = 1;//当前页
     protected $row = 20;//每页条数
     protected $header = [];//设置请求头参数
     protected $order = 'id';
@@ -80,7 +80,7 @@ class BaseController extends Controller
                 case "order":
                     $this->order = $v;
                     break;
-                case 'p':
+                case 'page':
                     $this->p = $v;
                     break;
                 case 'row':
--- a/app/Http/Controllers/Bside/ProjectGroupController.php
查看文件 @36aab10
+++ b/app/Http/Controllers/Bside/ProjectGroupController.php
查看文件 @36aab10
@@ -2,8 +2,12 @@
 namespace App\Http\Controllers\Bside;
+use App\Enums\Common\Code;
 use App\Http\Logic\Bside\ProjectGroupLogic;
 use App\Http\Requests\Bside\ProjectGroupRequest;
+use App\Models\ProjectGroup as ProjectGroupModel;
+use Illuminate\Http\Request;
+
 /**
  * @name:用户组相关
@@ -16,9 +20,10 @@ class ProjectGroupController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function lists()
+    public function lists(ProjectGroupModel $projectGroupModel)
     {
-
+        $lists = $projectGroupModel->lists($this->map,$this->page,$this->row);
+        $this->response('success',Code::SUCCESS,$lists);
     }
     /**
@@ -29,8 +34,18 @@ class ProjectGroupController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function add(ProjectGroupRequest $request){
+    public function add(ProjectGroupRequest $request,ProjectGroupModel $projectGroupModel){
         $request->validated();
+        $this->param['project_id'] = $this->user['project_id'];
+        //TODO::成员列表：user_list
+        if(!isset($this->param['user_list']) || empty($this->param['user_list'])){
+            $this->param['user_list'] = $this->uid;
+        }
+        $this->param['admin_id'] = $this->uid;
+        $rs = $projectGroupModel->add($this->param);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
+        }
         $this->response('success');
     }
@@ -42,8 +57,16 @@ class ProjectGroupController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function edit(ProjectGroupRequest $request){
-        $request->validated();
+    public function edit(ProjectGroupRequest $request,ProjectGroupModel $projectGroupModel){
+        $request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $rs = $projectGroupModel->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
+        }
         $this->response('success');
     }
@@ -53,7 +76,16 @@ class ProjectGroupController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(){
-
+    public function del(Request $request,ProjectGroupModel $projectGroupModel){
+        $request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $rs = $projectGroupModel->del($this->param);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        $this->response('success');
     }
 }
--- a/app/Http/Controllers/Bside/ProjectRoleController.php
查看文件 @36aab10
+++ b/app/Http/Controllers/Bside/ProjectRoleController.php
查看文件 @36aab10
@@ -81,16 +81,19 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function edit(ProjectRoleRequest $request){
+    public function edit(ProjectRoleRequest $request,ProjectRoleModel $projectRoleModel){
         $request->validate([
             'id'=>['required']
         ],[
             'id.required' => 'ID不能为空'
         ]);
-        $projectRoleModel = new ProjectRoleModel();
         //TODO::查询当前名称是否重复
-        $info = $projectRoleModel->where('id','<>',$this->param['id'])
-            ->where(['name'=>$this->param['name'],'project_id'=>$this->user['project_id']])->first();
+        $condition = [
+            ['id'=>['!=',$this->param['id']]],
+            ['name'=>$this->param['name']],
+            ['project_id'=>$this->user['project_id']],
+        ];
+        $info = $projectRoleModel->formatQuery($condition)->first();
         if(!empty($info)){
             $this->response('当前添加的角色已存在',Code::USER_PARAMS_ERROE);
         }
@@ -98,7 +101,7 @@ class ProjectRoleController extends BaseController
         if($rs === false){
             $this->response('编辑失败',Code::USER_PARAMS_ERROE);
         }
-        $this->response('编辑成功',Code::SUCCESS);
+        $this->response('编辑成功');
     }
     /**
@@ -107,7 +110,7 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function status(Request $request){
+    public function status(Request $request,ProjectRoleModel $projectRoleModel){
         $request->validate([
             'id'=>['required'],
             'status'=>['required'],
@@ -115,7 +118,6 @@ class ProjectRoleController extends BaseController
             'id.required' => 'ID不能为空',
             'status.required' => 'status不能为空'
         ]);
-        $projectRoleModel = new ProjectRoleModel();
         $rs = $projectRoleModel->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
         if($rs === false){
             $this->response('编辑失败',Code::USER_PARAMS_ERROE);
@@ -129,13 +131,12 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(Request $request){
+    public function del(Request $request,ProjectRoleModel $projectRoleModel){
         $request->validate([
             'id'=>['required']
         ],[
             'id.required' => 'ID不能为空'
         ]);
-        $projectRoleModel = new ProjectRoleModel();
         //查询当前角色下是否有用户
         $userModel = new UserModel();
         $user_info = $userModel->read(['role_id'=>$this->param['id']]);
--- a/app/Http/Controllers/Bside/UserController.php
查看文件 @36aab10
+++ b/app/Http/Controllers/Bside/UserController.php
查看文件 @36aab10
@@ -16,9 +16,8 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function lists(){
+    public function lists(UserModel $userModel){
         //TODO::搜索参数处理
-        $userModel = new UserModel();
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $userModel->lists($this->map,$this->p,$this->row,$this->order,['id','name','mobile','created_at']);
         if(empty($lists)){
@@ -33,9 +32,8 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function add(UserRequest $request){
+    public function add(UserRequest $request,UserModel $userModel){
         $request->validated();
-        $userModel = new UserModel();
         $this->param['project_id'] = $this->user['project_id'];
         $rs = $userModel->adds($this->param);
         if($rs === false){
@@ -50,13 +48,12 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function edit(UserRequest $request){
+    public function edit(UserRequest $request,UserModel $userModel){
         $request->validate([
             'id'=>['required']
         ],[
             'id.required' => 'ID不能为空'
         ]);
-        $userModel = new UserModel();
         $info = $userModel->where('id','<>',$this->param['id'])
             ->where(['mobile'=>$this->param['mobile']])->first();
         if(!empty($info)){
@@ -75,7 +72,7 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function status(Request $request){
+    public function status(Request $request,UserModel $userModel){
         $request->validate([
             'id'=>['required'],
             'status'=>['required'],
@@ -83,8 +80,7 @@ class UserController extends BaseController
             'id.required' => 'ID不能为空',
             'status.required' => 'status不能为空'
         ]);
-        $userLogic = new UserModel();
-        $rs = $userLogic->edit($this->param,['id'=>$this->param['id']]);
+        $rs = $userModel->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
             $this->response('error',Code::USER_ERROR);
         }
@@ -96,13 +92,12 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(Request $request){
+    public function del(Request $request,UserModel $userModel){
         $request->validate([
             'id'=>['required', new Ids()],
         ],[
             'id.required' => 'ID不能为空',
         ]);
-        $userModel = new UserModel();
         $rs = $userModel->del($this->param);
         if($rs === false){
             $this->response('删除失败',Code::USER_ERROR);
--- a/app/Http/Requests/Bside/ProjectGroupRequest.php
查看文件 @36aab10
+++ b/app/Http/Requests/Bside/ProjectGroupRequest.php
查看文件 @36aab10
@@ -26,8 +26,7 @@ class ProjectGroupRequest extends FormRequest
     public function messages()
     {
         return [
-            'name.required' => '请输入文章标题',
-//            'body.required' => '请输入文章内容',
+            'name.required' => '请输入用户组名称',
         ];
     }
 }
--- a/app/Models/Base.php
查看文件 @36aab10
+++ b/app/Models/Base.php
查看文件 @36aab10
@@ -15,7 +15,6 @@ class Base extends Model
         'created_at' => 'datetime:Y-m-d H:i:s',
         'updated_at' => 'datetime:Y-m-d H:i:s',
     ];
-
     /**
      * 日期序列化 勿删 删了时间就不是东八区时间了哈
      * @param \DateTimeInterface $date
@@ -27,7 +26,6 @@ class Base extends Model
     {
         return $date->format('Y-m-d H:i:s');
     }
-
     /**
      * @name 列表数据
      * @return void
@@ -35,7 +33,6 @@ class Base extends Model
      * @method
      */
     public function lists($map, $p, $row, $order = 'id', $fields = ['*']){
-        //TODO::where(['id'=>'','name'=>''])
         $query = $this->formatQuery($map);
         $lists = $query->select($fields)->orderBy($order)->paginate($row, ['*'], 'page', $p);
         if (empty($lists)) {
@@ -44,13 +41,11 @@ class Base extends Model
         $lists = $lists->toArray();
         return $lists;
     }
-
-
     /**
+     * @name  :无分页列表
      * @param $map
      * @param $order
      * @param $fields
-     * @name  :无分页列表
      * @return mixed
      * @author :liyuhang
      * @method
@@ -65,8 +60,8 @@ class Base extends Model
         return $lists;
     }
     /**
-     * @param array:$condition
      * @name :获取单条数据详情
+     * @param array
      * @return mixed
      * @author :liyuhang
      * @method get
@@ -81,8 +76,6 @@ class Base extends Model
         $info = $info->toArray();
         return $info;
     }
-
-
     /**
      * @name :新增
      * @return void
@@ -94,7 +87,6 @@ class Base extends Model
         $data['updated_at'] = date('Y-m-d H:i:s');
         return $this->insert($data);
     }
-
     /**
      * @name :编辑
      * @return void
@@ -107,7 +99,6 @@ class Base extends Model
         $rs = $query->update($data);
         return $rs;
     }
-
     /**
      * @name : 删除数据
      * @return void
@@ -118,12 +109,10 @@ class Base extends Model
         $query = $this->formatQuery($condition);
         return $query->delete();
     }
-
-
     /**
+     * @name :参数处理查询
      * @param $map = ['$k'=>['like',$v],$k1]
      * @param $val
-     * @name :参数处理查询
      * @return Base
      * @author :liyuhang
      * @method
@@ -132,45 +121,48 @@ class Base extends Model
         $model = $query ?: $this;
         $query = $model->where(function ($query) use ($map){
             foreach ($map as $k => $v){
-                if(is_array($v)){
-                    //拼接数据
-                    foreach ($v as $k1 => $v1){
-                        switch ($k1){
-                            case 'like':
-                                // like查询 ['name|title'=> ['like','%a%']]
-                                if (strpos($k, '|') !== false) {
-                                    $query->where(function ($query) use ($k,$v1) {
-                                        $item = explode('|', $k);
-                                        foreach ($item as $vo) {
-                                            $query->orWhere($vo, $v1[0], $v1[1]);
-                                        }
-                                    });
-                                } else {
-                                    $query->where($k,$v1[0], $v1[1]);
-                                }
-                                break;
-                            case 'in':
-                                // in查询 ['id'=>['in'=>[1,2,3]]]
-                                $query->whereIn($k, $v1[1]);
-                                break;
-                            case 'no in':
-                                // in查询 ['id'=>['not in'=>[1,2,3]]]
-                                $query->whereNotIn($k, $v1[1]);
-                                break;
-                            case 'between':
-                                // in查询 ['id'=>['between'=>[create1,create2]]]
-                                $query->whereBetween($k, $v1[1]);
-                            case 'not between':
-                                // not between查询 ['created_at'=>['not between'=>['xxx', 'xxx]]]
-                                $query->whereNotBetween($k, $v1[1]);
-                                break;
-                            default:
-                                $query->where($k,$k1,$v1[1]);
-                                break;
-                        }
-                    }
-                }else{
+                if(!is_array($v)){
                     $query->where($k,$v);
+                    continue;
+                }
+                foreach ($v as $k1 => $v1){
+                    if(!is_array($v1)){
+                        $query->where($k1,$v1);
+                        continue;
+                    }
+                    switch ($v1[0]){
+                        case 'like':
+                            // like查询 ['name|title'=> ['like','%a%']]
+                            if (strpos($k1, '|') !== false) {
+                                $query->where(function ($query) use ($k1,$v1) {
+                                    $item = explode('|', $k1);
+                                    foreach ($item as $vo) {
+                                        $query->orWhere($vo, $v1[0], $v1[1]);
+                                    }
+                                });
+                            } else {
+                                $query->where($k1,$v1[0], $v1[1]);
+                            }
+                            break;
+                        case 'in':
+                            // in查询 ['id'=>['in'=>[1,2,3]]]
+                            $query->whereIn($k1, $v1[1]);
+                            break;
+                        case 'no in':
+                            // in查询 ['id'=>['not in'=>[1,2,3]]]
+                            $query->whereNotIn($k1, $v1[1]);
+                            break;
+                        case 'between':
+                            // in查询 ['id'=>['between'=>[create1,create2]]]
+                            $query->whereBetween($k1, $v1[1]);
+                        case 'not between':
+                            // not between查询 ['created_at'=>['not between'=>['xxx', 'xxx]]]
+                            $query->whereNotBetween($k1, $v1[1]);
+                            break;
+                        default:
+                            $query->where($k1,$v1[0],$v1[1]);
+                            break;
+                    }
                 }
             }
         });
--- a/routes/bside.php
查看文件 @36aab10
+++ b/routes/bside.php
查看文件 @36aab10
@@ -39,7 +39,7 @@ Route::middleware(['bloginauth'])->group(function () {
         //产品
         Route::get('/', [\App\Http\Controllers\Bside\Product\ProductController::class, 'index'])->name('product');
         Route::get('/info', [\App\Http\Controllers\Bside\Product\ProductController::class, 'info'])->name('product_info');
-        Route::post('/save', [\App\Http\Controllers\Bside\Product\ProductController::class, 'save'])->name('product_save');
+        Route::post('/save', [\App\Http\Controllers\Bside\Product\ProductController::class, 'save'])->name('  ');
         Route::any('/delete', [\App\Http\Controllers\Bside\Product\ProductController::class, 'delete'])->name('product_delete');
         //产品分类