Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -104,8 +104,10 @@ class ManageController extends BaseController
     public function setSort(ManageLogic $logic){
     public function setSort(ManageLogic $logic){
         $this->request->validate([
         $this->request->validate([
             'id'=>'required',
             'id'=>'required',
+            'sort'=>'required',
         ],[
         ],[
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
+            'sort.required' => 'sort不能为空',
         ]);
         ]);
         $logic->setParamStatus();
         $logic->setParamStatus();
         $this->response('success');
         $this->response('success');

+<?php
+/**
+ * @remark :
+ * @name   :KeywordsController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2023/9/4 10:12
+ */
+
+namespace App\Http\Controllers\Aside\Optimize;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+
+class KeywordsController extends BaseController
+{
+    /**
+     * @remark :关键字查案例
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/4 10:13
+     */
+    public function lists(){
+        $lists = [];
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+}

@@ -200,4 +200,29 @@ class TaskController extends BaseController
         }
         }
         return $v;
         return $v;
     }
     }
+
+    /**
+     * @remark :获取我的任务列表
+     * @name   :getUserTaskList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/4 9:14
+     */
+    public function getUserTaskList(){
+        $taskOwnerModel = new TaskOwner();
+        $this->map['manage_id'] = $this->manage['id'];
+        $lists = $taskOwnerModel->lists($this->map,$this->page,$this->row,$this->order);
+        if(!empty($lists) && !empty($lists['list'])){
+            $taskModel = new Task();
+            $managerModel = new Manage();
+            foreach ($lists['list'] as $k => $v){
+                $taskInfo = $taskModel->read(['id'=>$v['task_id']]);
+                $taskInfo = $this->getFileUrl($taskInfo);
+                $v["manage_id_text"] = $managerModel->getName($v['manage_id']);
+                $v['task_info'] = $taskInfo;
+                $lists['list'][$k] = $v;
+            }
+        }
+        $this->response('success',Code::SUCCESS,$lists);
+    }
 }
 }

@@ -30,7 +30,8 @@ class ProjectMenuController extends BaseController
      * @time   :2023/6/21 17:24
      * @time   :2023/6/21 17:24
      */
      */
     public function lists(ProjectMenuLogic $projectMenuLogic){
     public function lists(ProjectMenuLogic $projectMenuLogic){
-        $lists = $projectMenuLogic->MenuList($this->map);
+        $this->order = 'sort';
+        $lists = $projectMenuLogic->MenuList($this->map,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
@@ -137,4 +138,21 @@ class ProjectMenuController extends BaseController
         $list = $projectMenuLogic->roleMenuInfo();
         $list = $projectMenuLogic->roleMenuInfo();
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
+
+    /**
+     * @remark :排序
+     * @name   :setSort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/10 16:40
+     */
+    public function sort(ProjectMenuLogic $projectMenuLogic){
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $projectMenuLogic->setParamStatus();
+        $this->response('success');
+    }
 }
 }

@@ -145,4 +145,21 @@ class ProjectUserController extends BaseController
         $list =  $roleModel->list($this->map);
         $list =  $roleModel->list($this->map);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
+
+    /**
+     * @remark :排序
+     * @name   :setSort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/10 16:40
+     */
+    public function sort(UserLogic $userLogic){
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $userLogic->setParamStatus();
+        $this->response('success');
+    }
 }
 }

@@ -115,4 +115,19 @@ class ProjectMenuLogic extends BaseLogic
         $list = $this->model->list(['pid'=>$this->param['id'], 'is_role'=>1]);
         $list = $this->model->list(['pid'=>$this->param['id'], 'is_role'=>1]);
         return $this->success($list);
         return $this->success($list);
     }
     }
+
+    /**
+     * @remark :设置排序
+     * @name   :setSort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/10 16:42
+     */
+    public function setParamStatus(){
+        $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('修改失败');
+        }
+        return $this->success();
+    }
 }
 }

@@ -159,4 +159,19 @@ class UserLogic extends BaseLogic
         Common::del_user_cache($this->model, $ids, 'A');
         Common::del_user_cache($this->model, $ids, 'A');
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :设置排序
+     * @name   :setSort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/10 16:42
+     */
+    public function setParamStatus(){
+        $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('修改失败');
+        }
+        return $this->success();
+    }
 }
 }

@@ -20,6 +20,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/save', [Aside\User\ProjectUserController::class, 'save'])->name('admin.user_save');
         Route::any('/save', [Aside\User\ProjectUserController::class, 'save'])->name('admin.user_save');
         Route::any('/del', [Aside\User\ProjectUserController::class, 'del'])->name('admin.user_del');
         Route::any('/del', [Aside\User\ProjectUserController::class, 'del'])->name('admin.user_del');
         Route::any('/getRole', [Aside\User\ProjectUserController::class, 'getRole'])->name('admin.user_getRole');
         Route::any('/getRole', [Aside\User\ProjectUserController::class, 'getRole'])->name('admin.user_getRole');
+        Route::any('/sort', [Aside\User\ProjectUserController::class, 'sort'])->name('admin.user_sort');
 
 
         //角色管理
         //角色管理
         Route::prefix('role')->group(function () {
         Route::prefix('role')->group(function () {
@@ -41,6 +42,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/del', [Aside\User\ProjectMenuController::class, 'del'])->name('admin.user_menu_del');
             Route::any('/del', [Aside\User\ProjectMenuController::class, 'del'])->name('admin.user_menu_del');
             Route::any('/getSonMenu', [Aside\User\ProjectMenuController::class, 'getSonMenu'])->name('admin.user_menu_getSonMenu');
             Route::any('/getSonMenu', [Aside\User\ProjectMenuController::class, 'getSonMenu'])->name('admin.user_menu_getSonMenu');
             Route::any('/routes', [Aside\User\ProjectMenuController::class, 'routes'])->name('admin.user_menu_routes');
             Route::any('/routes', [Aside\User\ProjectMenuController::class, 'routes'])->name('admin.user_menu_routes');
+            Route::any('/sort', [Aside\User\ProjectMenuController::class, 'sort'])->name('admin.user_menu_sort');
         });
         });
 
 
         //用户组
         //用户组
@@ -175,6 +177,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::post('/save', [Aside\Task\TaskController::class, 'save'])->name('admin.task_save');
         Route::post('/save', [Aside\Task\TaskController::class, 'save'])->name('admin.task_save');
         Route::post('/status', [Aside\Task\TaskController::class, 'status'])->name('admin.task_status');
         Route::post('/status', [Aside\Task\TaskController::class, 'status'])->name('admin.task_status');
         Route::post('/save_follow', [Aside\Task\TaskController::class, 'save_follow'])->name('admin.task_save_follow');
         Route::post('/save_follow', [Aside\Task\TaskController::class, 'save_follow'])->name('admin.task_save_follow');
+        Route::any('/getUserTaskList', [Aside\Task\TaskController::class, 'getUserTaskList'])->name('admin.task_getUserTaskList');
     });
     });
     //服务器配置
     //服务器配置
     Route::prefix('devops')->group(function () {
     Route::prefix('devops')->group(function () {
@@ -224,6 +227,11 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/', [Aside\Optimize\OptimizeController::class, 'lists'])->name('admin.optimize_lists');//优化中台
         Route::any('/', [Aside\Optimize\OptimizeController::class, 'lists'])->name('admin.optimize_lists');//优化中台
     });
     });
 
 
+    //优化中台
+    Route::prefix('keywords')->group(function () {
+        Route::any('/', [Aside\Optimize\KeywordsController::class, 'lists'])->name('admin.optimize_keywords_lists');//优化中台
+    });
+
     //上线审核列表
     //上线审核列表
     Route::prefix('online')->group(function () {
     Route::prefix('online')->group(function () {
         Route::any('/', [Aside\Optimize\OnlineController::class, 'lists'])->name('admin.online_lists');//上线审核列表
         Route::any('/', [Aside\Optimize\OnlineController::class, 'lists'])->name('admin.online_lists');//上线审核列表