Merge remote-tracking branch 'origin/master' into akun

刘锟
app/Console/Commands/Ai/AiBlogTask.php
app/Console/Commands/Geo/GeoQuestionRes.php
app/Console/Commands/LyhTest/lyhDemo.php
app/Console/Commands/Project/SyncProject.php
app/Console/Commands/WorkOrder/FetchTicketProjects.php
app/Http/Controllers/Aside/WorkOrder/TicketProjectController.php
app/Http/Controllers/Bside/Geo/GeoQuestionResController.php
app/Http/Controllers/Bside/Product/ProductController.php
app/Http/Logic/Bside/Geo/GeoQuestionResLogic.php
app/Models/Geo/GeoPlatform.php
app/Models/WorkOrder/TicketProject.php
app/Services/Geo/GeoService.php
routes/aside.php
--- a/app/Console/Commands/Ai/AiBlogTask.php
查看文件 @b26356e
+++ b/app/Console/Commands/Ai/AiBlogTask.php
查看文件 @b26356e
@@ -256,7 +256,7 @@ class AiBlogTask extends Command
         $page = 1;
         $saveData = [];
         $result = $aiBlogService->getAiBlogList($page,15);
-        if(!isset($result['status']) && $result['status'] != 200){
+        if(!isset($result['status']) || $result['status'] != 200){
             return true;
         }
         $total_page = $result['data']['total_page'];
--- a/app/Console/Commands/Geo/GeoQuestionRes.php
查看文件 @b26356e
+++ b/app/Console/Commands/Geo/GeoQuestionRes.php
查看文件 @b26356e
@@ -99,7 +99,7 @@ class GeoQuestionRes extends Command
                                 $data = $geo_service->getDeepSeekResult($question);
                                 $result = $this->dealDeepSeek($data);
                                 break;
-                            case 'gpt-4o-mini':
+                            case 'openai-not-network':
                                 $data = $geo_service->getDeepSeekResult($question,'gpt-4o-mini');
                                 $result = $this->dealDeepSeek($data,'gpt-4o-mini');
                                 break;
--- a/app/Console/Commands/LyhTest/lyhDemo.php
查看文件 @b26356e
+++ b/app/Console/Commands/LyhTest/lyhDemo.php
查看文件 @b26356e
@@ -21,6 +21,7 @@ use App\Models\Project\ProjectWhiteHatAffix;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Services\AiBlogService;
+use App\Services\Geo\GeoService;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
@@ -53,22 +54,25 @@ class lyhDemo extends Command
      * @time   :2025/7/22 15:14
      */
     public function _actionRoute(){
-        $projectModel = new Project();
-        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
-        $data = [];
-        foreach ($lists as $item){
-            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
-            ProjectServer::useProject($item['id']);
-            $aiBlogModel = new AiBlog();
-            $info = $aiBlogModel->read(['route'=>null],['id']);
-            if($info !== false){
-                echo '项目id:'.$item['id'].PHP_EOL;
-                $data[] = $item['id'];
-            }
-            dd($data);
-            echo 'end';
-            DB::disconnect('custom_mysql');
-        }
+        $geo_service = new GeoService();
+        $data = $geo_service->getDeepSeekResult("创贸总共多少人？",'gpt-4o-mini');
+        dd($data);
+//        $projectModel = new Project();
+//        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
+//        $data = [];
+//        foreach ($lists as $item){
+//            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
+//            ProjectServer::useProject($item['id']);
+//            $aiBlogModel = new AiBlog();
+//            $info = $aiBlogModel->read(['route'=>null],['id']);
+//            if($info !== false){
+//                echo '项目id:'.$item['id'].PHP_EOL;
+//                $data[] = $item['id'];
+//            }
+//            dd($data);
+//            echo 'end';
+//            DB::disconnect('custom_mysql');
+//        }
     }
     public function _actionTemplateMain(){
--- a/app/Console/Commands/Project/SyncProject.php
查看文件 @b26356e
+++ b/app/Console/Commands/Project/SyncProject.php
查看文件 @b26356e
@@ -151,12 +151,13 @@ class SyncProject extends Command
             'contract' => json_encode($param['files']),
             'bill' => json_encode($param['images']),
         ];
-        if($param['plan_marketing'] == '白帽SEO方案'){
-            $data['seo_service_duration'] =  $param['years'] ?? 0;
-            $data['seo_plan'] = 1;
-        }else{
-            $data['service_duration'] =  $param['years'] ?? 0;
-            $data['plan'] = $this->versionData($param['plan_marketing']);
+        $seoPlan = Project::seoMap();
+        if (in_array($param['plan_marketing'], $seoPlan)) {
+            $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
+            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing'],$seoPlan);
+        } else {
+            $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
+            $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing']);
         }
         $renewModel = new ProjectRenew();
         $rs = $renewModel->add($data);
@@ -183,8 +184,7 @@ class SyncProject extends Command
         }
     }
-    public function versionSeoData($param){
-        $data = Project::seoMap();
+    public function versionSeoData($param,$data){
         $data = array_flip($data);
         if(isset($data[$param])){
             return $data[$param];
@@ -240,10 +240,11 @@ class SyncProject extends Command
                 'bill'=>$param['images']
             ],
         ];
-        if($param['plan_marketing'] == '白帽SEO方案'){
+        $seoPlan = Project::seoMap();
+        if (in_array($param['plan_marketing'], $seoPlan)) {
             $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
-            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing']);
-        }else{
+            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing'],$seoPlan);
+        } else {
             $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
             $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing']);
         }
--- a/app/Console/Commands/WorkOrder/FetchTicketProjects.php
查看文件 @b26356e
+++ b/app/Console/Commands/WorkOrder/FetchTicketProjects.php
查看文件 @b26356e
@@ -82,9 +82,9 @@ class FetchTicketProjects extends Command
                     elseif ($item['cate'] == "建站中")
                         $status=1; // 建站中
-                    $assm_id = Manage::where('name', $item['assm'])->value('id') ?? Manage::where('name', '张鸿飞')->value('id') ?? 0;  //售后服务经理
-                    $seom_id = Manage::where('name', $item['yhs'])->value('id') ?? Manage::where('name', '陶婵')->value('id') ?? 0;  //优化师
-                    $pm_id = Manage::where('name', $item['pm'])->value('id') ?? Manage::where('name', '李洁玉')->value('id') ?? 0; // 项目经理
+                    $assm_id = ManageHr::where('name', $item['assm'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '张鸿飞')->where('status', 1)->value('manage_id') ?? 0;  //售后服务经理
+                    $seom_id = ManageHr::where('name', $item['yhs'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '陶婵')->where('status', 1)->value('manage_id') ?? 0;  //优化师
+                    $pm_id = ManageHr::where('name', $item['pm'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '李洁玉')->where('status', 1)->value('manage_id') ?? 0; // 项目经理
                     /**
                      * 第一负责人逻即说明：
@@ -100,6 +100,22 @@ class FetchTicketProjects extends Command
                     elseif ($status == 1)
                         $engineer_id = $pm_id; // 建站中找项目经理
+                    $team_names = [
+                        $item['pm'],
+                        $item['assm'],
+                        $item['yhs'],
+                        $item['team_leader'],
+                        $item['technology'],
+                        $item['designer'],
+                        $item['yhszl'],
+                    ];
+                    // 过滤掉空值,去掉重复
+                    $team_ids = ManageHr::whereIn('name', $team_names)->where('status', 1)->pluck('manage_id')
+                        ->unique()
+                        ->filter(fn($v) => !is_null($v) && $v !== 0)
+                        ->values()
+                        ->toArray();
+
                     $fields = [
                         'post_id' => $item['postid'],
                         'company_name' => $item['company'],
@@ -114,7 +130,8 @@ class FetchTicketProjects extends Command
                         'project_cate' => 1,
                         'pm_id' => $pm_id,
                         'status' => $status, // 项目状态
-                        'wechat_group_id' => $item['wx_id']
+                        'wechat_group_id' => $item['wx_id'],
+                        'team' => $team_ids ? json_encode($team_ids) : null,
                     ];
                     if (!$project) {
                         $new = new TicketProject();
@@ -186,22 +203,22 @@ class FetchTicketProjects extends Command
                     // 售后服务经理
                     $assm_id = collect([
-                        ManageHr::find($item->deploy_optimize->manager_mid)->manage_id ?? 0,
-                        ManageHr::find($item->deploy_optimize->tech_leader)->manage_id ?? 0,
+                        ManageHr::where('status', 1)->find($item->deploy_optimize->manager_mid)->manage_id ?? 0,
+                        ManageHr::where('status', 1)->find($item->deploy_optimize->tech_leader)->manage_id ?? 0,
                         8,  //张鸿飞
                     ])->first(fn($v) => $v !== null && $v !== 0, 0);
                     // 优化师
-                    $seom_id = ManageHr::find($item->deploy_optimize->optimist_mid) ? ManageHr::find($item->deploy_optimize->optimist_mid)->manage_id : 0;
+                    $seom_id = ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid) ? ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid)->manage_id : 0;
                     // 项目经理
-                    $pm_id = ManageHr::find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('name', '李洁玉')->value('manage_id') ?? 0;
+                    $pm_id = ManageHr::where('status', 1)->find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('status', 1)->where('name', '李洁玉')->value('manage_id') ?? 0;
                     // 第一负责人
                     if ($status == 1)
                         $engineer_id = $pm_id; // 建站中找项目经理
                     elseif ($status == 2)
-                        $engineer_id = Manage::where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
+                        $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
                     else
                         $engineer_id = $assm_id; // 推广找售后服务经理
@@ -212,6 +229,23 @@ class FetchTicketProjects extends Command
                         || $item->site_status == 1
                     ) ? 1 : 0;
+                    $team_ids = [
+                        $item->deploy_build->leader_mid,
+                        $item->deploy_build->manager_mid,
+                        $item->deploy_build->designer_mid,
+                        $item->deploy_build->tech_mid,
+                        $item->deploy_optimize->manager_mid,
+                        $item->deploy_optimize->optimist_mid,
+                        $item->deploy_optimize->assist_mid,
+                        $item->deploy_optimize->tech_mid,
+                        $item->deploy_optimize->tech_leader,
+                    ];
+                    // $team_ids 去重复
+                    $team_ids = array_unique($team_ids);
+                    $team_ids = array_filter($team_ids);
+                    // $team_ids 去掉下标
+                    $team_ids = array_values($team_ids);
+
                     $fields = [
                         'company_name' => $item->company,
                         'title' => $item->title . " - V6",
@@ -230,6 +264,7 @@ class FetchTicketProjects extends Command
                             ->value('friend_id'),
                         'pm_id' => $pm_id,
                         'status' => $status, // 项目状态
+                        'team' => $team_ids ? json_encode($team_ids) : null,
                     ];
                     if (!$project) {
                         $project = new TicketProject();
@@ -289,14 +324,14 @@ class FetchTicketProjects extends Command
                         {
                             // 售后服务经理
                             $assm_id = collect([
-                                ManageHr::where('name', $item['cj_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
+                                ManageHr::where('status', 1)->where('name', $item['cj_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
                                 20,  //徐莹
                             ])->first(fn($v) => $v !== null && $v !== 0, 0);
                         }else
                         {
                             // 域途
                             $assm_id = collect([
-                                ManageHr::where('name', $item['yutu_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
+                                ManageHr::where('status', 1)->where('name', $item['yutu_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
                                 85,  //黄小玉
                             ])->first(fn($v) => $v !== null && $v !== 0, 0);
                         }
--- a/app/Http/Controllers/Aside/WorkOrder/TicketProjectController.php
查看文件 @b26356e
+++ b/app/Http/Controllers/Aside/WorkOrder/TicketProjectController.php
查看文件 @b26356e
@@ -93,4 +93,24 @@ class TicketProjectController extends BaseController
     {
         //
     }
+
+    /**
+     * 获取项目团队信息
+     *
+     * @param string $id 项目UUID
+     * @return mixed 返回项目团队信息或错误响应
+     */
+    public function team($id)
+    {
+        // 根据UUID查找项目
+        $project = TicketProject::where('uuid', $id)->first();
+
+        // 如果项目不存在，返回错误响应
+        if (!$project) $this->response('Project not found', Code::USER_MODEL_NOTFOUND_ERROE);
+
+        // 返回项目团队信息
+        // 修改: 使用 getTeam() 方法而不是 getTeam 属性
+        return $this->response('Project team', Code::SUCCESS, $project->getTeam());
+    }
+
 }
--- a/app/Http/Controllers/Bside/Geo/GeoQuestionResController.php
查看文件 @b26356e
+++ b/app/Http/Controllers/Bside/Geo/GeoQuestionResController.php
查看文件 @b26356e
@@ -117,21 +117,4 @@ class GeoQuestionResController extends BaseController
         $data = $this->logic->getSearchDate();
         $this->response('success',Code::SUCCESS,$data);
     }
-
-    /**
-     * @remark :获取搜索列表
-     * @name   :getSearchList
-     * @author :lyh
-     * @method :post
-     * @time   :2025/7/21 16:47
-     */
-    public function getSearchList(){
-        $this->request->validate([
-            'created_at'=>'required',
-        ],[
-            'created_at.required' => 'created_at不能为空',
-        ]);
-        $data = $this->logic->getSearchList($this->map,$this->page,$this->row);
-        $this->response('success',Code::SUCCESS,$data);
-    }
 }
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @b26356e
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @b26356e
@@ -652,7 +652,10 @@ class ProductController extends BaseController
         }
         if(isset($this->map['title']) && !empty($this->map['title'])){
             $this->map['title'] = str_replace('+',' ',$this->map['title']);
-            $query = $query->where('title','like','%'.$this->map['title'].'%');
+            $query->where(function ($subQuery) {
+                $subQuery->where('title','like','%'.$this->map['title'].'%')
+                    ->orwhere('route','like','%'.$this->map['title'].'%');
+            });
         }
         if(isset($this->map['keyword_title']) && !empty($this->map['keyword_title'])){
             $keywordModel = new Keyword();
--- a/app/Http/Logic/Bside/Geo/GeoQuestionResLogic.php
查看文件 @b26356e
+++ b/app/Http/Logic/Bside/Geo/GeoQuestionResLogic.php
查看文件 @b26356e
@@ -47,12 +47,15 @@ class GeoQuestionResLogic extends BaseLogic
      * @time   :2025/7/4 9:48
      */
     public function getResultList($map = [],$page = 1,$row = 20){
+        $map['project_id'] = $this->user['project_id'];
         $filed = ['id','project_id','question_id','platform','question','en_question','keywords','url','created_at','updated_at'];
         if(!empty($map['created_at'])){
-            $map['project_id'] = $this->user['project_id'];
             $map['created_at'] = ['between',[$map['created_at'].' 00:00:00',$map['created_at'].' 23:59:59']];
             $this->model = new GeoQuestionLog();
         }
+        if(!empty($map['keywords'])){
+            $map['keywords'] = ['like','%'.$map['keywords'].'%'];
+        }
         $query = $this->model->formatQuery($map);
         $query = $query->where(function ($q) {
             $q->whereRaw('JSON_LENGTH(keywords) > 0')
--- a/app/Models/Geo/GeoPlatform.php
查看文件 @b26356e
+++ b/app/Models/Geo/GeoPlatform.php
查看文件 @b26356e
@@ -35,7 +35,7 @@ class GeoPlatform extends Base
     public function getList(){
 //        $data = Cache::get('geo_platform');
 //        if(empty($data)){
-            $data = $this->list(['status'=>$this::STATUS_ON],'id',['name','en_name','icon','sort'],'desc');
+            $data = $this->list(['status'=>$this::STATUS_ON],'id',['name','en_name','icon','sort'],'asc');
             Cache::put('geo_platform',$data,'12 * 3600');
 //        }
         return $data;
--- a/app/Models/WorkOrder/TicketProject.php
查看文件 @b26356e
+++ b/app/Models/WorkOrder/TicketProject.php
查看文件 @b26356e
@@ -93,4 +93,11 @@ class TicketProject extends Base
             $message_push->save();
         }
     }
+
+    public function getTeam()
+    {
+        return ManageHr::whereIn('manage_id', json_decode($this->team, true))
+            ->where('manage_id', '>', 0)
+            ->select(['manage_id', 'name', 'nickname', 'mobile'])->get()->toArray();
+    }
 }
--- a/app/Services/Geo/GeoService.php
查看文件 @b26356e
+++ b/app/Services/Geo/GeoService.php
查看文件 @b26356e
@@ -78,6 +78,17 @@ class GeoService
      */
     public function getDeepSeekResult($content,$model = 'deepseek-r1'){
         $url = $this->api_url . 'v1/chat';
+        switch ($model){
+            case 'deepseek-r1':
+                $supplier = 'bailian';
+                break;
+            case 'gpt-4o-mini':
+                $supplier = 'azure';
+                break;
+            default:
+                $supplier = '';
+                break;
+        }
         $header = [
             'accept: application/json',
             'X-CmerApi-Host: llm-chat.p.cmer.com',
@@ -92,7 +103,7 @@ class GeoService
                 ],
             ],
             'model' => $model,
-            "supplier"=> "bailian",
+            "supplier"=> $supplier,
             'security_check' => true
         ];
         $data = http_post($url,json_encode($message,true),$header);
--- a/routes/aside.php
查看文件 @b26356e
+++ b/routes/aside.php
查看文件 @b26356e
@@ -258,6 +258,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::get('/pushNotify/{id}', [Aside\WorkOrder\AsideTicketController::class, 'pushNotify'])->name('admin.tickets.pushNotify')->summary('A端工单推送企微群');
         Route::get('/projects/{search}', [Aside\WorkOrder\AsideTicketController::class, 'getProjects'])->name('admin.tickets.projects')->summary('A端V5V6项目列表');
         Route::patch('/projects/{id}', [Aside\WorkOrder\TicketProjectController::class, 'update'])->name('admin.tickets.projects.update')->summary('A端修改工单项目');
+        Route::get('/projects_team/{id}', [Aside\WorkOrder\TicketProjectController::class, 'team'])->name('admin.tickets.projects_team')->summary('A端工单项目团队');
         Route::get('/v56_projects/list', [Aside\WorkOrder\AsideTicketController::class, 'projectList'])->name('admin.tickets.projectList')->summary('A端V5V6项目列表')
             ->description("project_cate[项目分类1]: 1 V5, 2 V6, 3 超迹, 4 域途");
         Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单');