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

@@ -35,4 +35,15 @@ class HrController extends BaseController
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
+    /**
+     * @remark :获取组织部门
+     * @name   :deptList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/22 17:17
+     */
+    public function deptList(HrLogic $hrLogic){
+        $list = $hrLogic->deptList();
+        $this->response('success',Code::SUCCESS,$list);
+    }
 }
 }

@@ -2,7 +2,9 @@
 
 
 namespace App\Http\Controllers\Aside\Optimize;
 namespace App\Http\Controllers\Aside\Optimize;
 
 
+use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Optimize\KeywordsLogic;
 
 
 /**
 /**
  * @remark :关键字查询案例
  * @remark :关键字查询案例
@@ -19,7 +21,8 @@ class KeywordsController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/7/17 9:52
      * @time   :2023/7/17 9:52
      */
      */
-    public function getSearchKeyword(){
-
+    public function getSearchKeyword(KeywordsLogic $keywordsLogic){
+        $lists = $keywordsLogic->keySearchList($this->map);
+        $this->response('success',Code::SUCCESS,$lists);
     }
     }
 }
 }

@@ -35,6 +35,8 @@ class LoginLogic extends BaseLogic
             $this->fail('帐号已被禁用');
             $this->fail('帐号已被禁用');
         }
         }
         if (!Hash::check($this->requestAll['password'], $manage->password)) {
         if (!Hash::check($this->requestAll['password'], $manage->password)) {
+            var_dump($this->requestAll['password']);
+            die();
             $this->fail('登录密码不正确');
             $this->fail('登录密码不正确');
         }
         }
         if(!empty($manage['token'])){
         if(!empty($manage['token'])){

@@ -66,4 +66,6 @@ class HrLogic extends BaseLogic
         $data['dangzhibu'] = $this->model::dangzhibu();
         $data['dangzhibu'] = $this->model::dangzhibu();
         return $data;
         return $data;
     }
     }
+
+
 }
 }

+<?php
+
+namespace App\Http\Logic\Aside\Optimize;
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Product\Keyword;
+use App\Models\Project\Project;
+use App\Models\RouteMap;
+
+/**
+ * @remark :关键词查案例
+ * @class  :KeywordsLogic.php
+ * @author :lyh
+ * @time   :2023/7/22 11:44
+ */
+class KeywordsLogic extends BaseLogic
+{
+    const ISSET_TYPE = 1;//去重时写入默认值
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->routeMapModel = new RouteMap();
+        $this->productKeywordModel = new Keyword();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @remark :关键字查询案例
+     * @name   :keySearchList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/22 11:46
+     */
+    public function keySearchList($map){
+        $data = [];
+        $data = $this->searchRouteMap($map,$data);//查询菜单信息表
+        $data = $this->searchProductKeyword($map,$data);//查询产品关键词表
+        $data = array_unique($data);
+        $lists = [];
+        if(!empty($project_id)){
+            $projectModel = new Project();
+            $lists = $projectModel->formatQuery(['id'=>['in',$data]])->with('deploy_build')->with('deploy_optimize')->get();
+        }
+        return $this->success($lists);
+    }
+
+    /**
+     * @remark :菜单表中查询route关键字
+     * @name   :searchRouteMap
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/22 16:46
+     */
+    public function searchRouteMap($map,&$data){
+        $keyList = $this->routeMapModel->list(['route'=>$map['search']],'created_at');
+        foreach ($keyList as $v){
+            $data[] = $v['project_id'];
+        }
+        return $data;
+    }
+
+    /**
+     * @remark :搜索产品关键字
+     * @name   :searchProductKeyword
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/22 16:52
+     */
+    public function searchProductKeyword($map,&$data){
+        $keyList = $this->productKeywordModel->list(['title'=>$map['search']]);
+        foreach ($keyList as $v){
+            $data[] = $v['project_id'];
+        }
+        return $data;
+    }
+}

@@ -149,7 +149,6 @@ Route::middleware(['aloginauth'])->group(function () {
         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::prefix('devops')->group(function () {
     Route::prefix('devops')->group(function () {
         //服务器配置
         //服务器配置
@@ -222,6 +221,24 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/', [Aside\Optimize\ProcessController::class, 'lists'])->name('admin.process_lists');
         Route::any('/', [Aside\Optimize\ProcessController::class, 'lists'])->name('admin.process_lists');
         Route::any('/save', [Aside\Optimize\ProcessController::class, 'save'])->name('admin.process_save');
         Route::any('/save', [Aside\Optimize\ProcessController::class, 'save'])->name('admin.process_save');
     });
     });
+
+    //询盘
+    Route::prefix('inquiry')->group(function () {
+        Route::any('/', [Aside\Optimize\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');
+        Route::any('/save', [Aside\Optimize\InquiryInfoController::class, 'save'])->name('admin.inquiry_save');
+        Route::any('/status', [Aside\Optimize\InquiryInfoController::class, 'status'])->name('admin.inquiry_status');
+        Route::any('/getCount', [Aside\Optimize\InquiryInfoController::class, 'getCount'])->name('admin.inquiry_getCount');
+        Route::any('/forwardInquiry', [Aside\Optimize\InquiryInfoController::class, 'forwardInquiry'])->name('admin.inquiry_forwardInquiry');
+        Route::any('/info', [Aside\Optimize\InquiryInfoController::class, 'info'])->name('admin.inquiry_info');
+        Route::any('/importInquirySave', [Aside\Optimize\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave');
+        Route::any('/getSearchIpInfo', [Aside\Optimize\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo');
+        Route::any('/getKeywordUrl', [Aside\Optimize\InquiryInfoController::class, 'getKeywordUrl'])->name('admin.inquiry_getKeywordUrl');
+    });
+
+    //关键词查案例
+    Route::prefix('keyword')->group(function () {
+        Route::any('/', [Aside\Optimize\KeywordsController::class, 'getSearchKeyword'])->name('admin.keyword_getSearchKeyword');
+    });
 });
 });
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组
@@ -258,17 +275,6 @@ Route::group([], function () {
         });
         });
     });
     });
 
 
-    Route::prefix('inquiry')->group(function () {
-        Route::any('/', [Aside\Optimize\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');
-        Route::any('/save', [Aside\Optimize\InquiryInfoController::class, 'save'])->name('admin.inquiry_save');
-        Route::any('/status', [Aside\Optimize\InquiryInfoController::class, 'status'])->name('admin.inquiry_status');
-        Route::any('/getCount', [Aside\Optimize\InquiryInfoController::class, 'getCount'])->name('admin.inquiry_getCount');
-        Route::any('/forwardInquiry', [Aside\Optimize\InquiryInfoController::class, 'forwardInquiry'])->name('admin.inquiry_forwardInquiry');
-        Route::any('/info', [Aside\Optimize\InquiryInfoController::class, 'info'])->name('admin.inquiry_info');
-        Route::any('/importInquirySave', [Aside\Optimize\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave');
-        Route::any('/getSearchIpInfo', [Aside\Optimize\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo');
-        Route::any('/getKeywordUrl', [Aside\Optimize\InquiryInfoController::class, 'getKeywordUrl'])->name('admin.inquiry_getKeywordUrl');
-    });
 });
 });