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

@@ -339,7 +339,7 @@ class AiBlogTask extends Command
                 ];
                 $res = http_post($c_url, json_encode($param,true));
                 if(empty($res)){
-                    NoticeLog::createLog(NoticeLog::GENERATE_PAGE, json_encode(['c_url'=>$c_url,'c_params'=>$param]),date('Y-m-d H:i:s',time()+300));
+                    NoticeLog::createLog(NoticeLog::GENERATE_PAGE, ['c_url'=>$c_url,'c_params'=>$param],date('Y-m-d H:i:s',time()+300));
                 }
                 $this->output('notify: project id: ' . $project_id . ', result: ' . json_encode($res,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
             }

@@ -98,9 +98,17 @@ class KeywordPageAiContent extends Command
     public function ai_content(ProjectKeywordAiTask $task)
     {
         //前后缀
+        $default_affix = AggregateKeywordAffix::where('project_id', 0)->first();
         $affix = AggregateKeywordAffix::where('project_id', $task->project_id)->first();
-        $prefix = empty($affix['prefix']) ? [] : explode("\r\n", $affix['prefix']);
-        $suffix = empty($affix['suffix']) ? [] : explode("\r\n", $affix['suffix']);
+
+        $default_affix['prefix'] = str_replace("\r\n", "\n", $default_affix['prefix']);
+        $default_affix['suffix'] = str_replace("\r\n", "\n", $default_affix['suffix']);
+        $affix['prefix'] = str_replace("\r\n", "\n", $affix['prefix']);
+        $affix['prefix'] = str_replace("\r\n", "\n", $affix['prefix']);
+
+        $prefix = empty($affix['prefix']) ? explode("\n", $default_affix['prefix']) : explode("\n", $affix['prefix']);
+        $suffix = empty($affix['suffix']) ? explode("\n", $default_affix['suffix']) : explode("\n", $affix['suffix']);
+
         if (!$prefix || !$suffix) {
             throw new ValidateException('扩展标题前后缀不存在');
         }
@@ -259,7 +267,7 @@ class KeywordPageAiContent extends Command
             'url' => [],
             'language' => [],
         ];
-        NoticeLog::createLog(NoticeLog::GENERATE_PAGE, json_encode(['c_url' => $url, 'c_params' => $param]), date('Y-m-d H:i:s', time() + 300));
+        NoticeLog::createLog(NoticeLog::GENERATE_PAGE, ['c_url' => $url, 'c_params' => $param], date('Y-m-d H:i:s', time() + 300));
         echo getmypid() . ' ' . '更新中请稍后, 更新完成将会发送站内信通知更新结果！' . PHP_EOL;
     }
 }

+<?php
+/**
+ * @remark :
+ * @name   :UpdateProjectTdk.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/7/2 11:11
+ */
+
+namespace App\Console\Commands\Tdk;
+
+use App\Models\Blog\Blog;
+use App\Models\Blog\BlogCategory;
+use App\Models\Com\NoticeLog;
+use App\Models\CustomModule\CustomModuleCategory;
+use App\Models\CustomModule\CustomModuleContent;
+use App\Models\News\News;
+use App\Models\News\NewsCategory;
+use App\Models\Product\Category;
+use App\Models\Product\Keyword;
+use App\Models\Product\Product;
+use App\Models\Project\Project;
+use App\Models\RouteMap\RouteMap;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redis;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use function Aws\default_http_handler;
+
+class UpdateProjectTdk extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update_project_tdk';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '根据给定的文件更新项目的tdk';
+
+
+    public function handle(){
+        $noticeLogModel = new NoticeLog();
+        while (true){
+            $task_id = $this->getTaskId();
+            if(empty($task_id)){
+                sleep(30);
+                continue;
+            }
+            $info = $noticeLogModel->read(['id'=>$task_id]);
+            if($info !== false){
+                echo 'start--'.PHP_EOL;
+                $project_id = $info['data']['project_id'] ?? 0;
+                if(empty($project_id)){
+                    echo date('Y-m-d H:i:s').'未获取到项目id.'.PHP_EOL;
+                    $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_FAIL],['id'=>$task_id]);
+                    continue;
+                }
+                ProjectServer::useProject($project_id);
+                $url = $info['data']['url'] ?? '';
+                if(empty($url)){
+                    echo date('Y-m-d H:i:s').'未获取到项目更新文件.项目id为：'.$project_id.PHP_EOL;
+                    //未获取到文件，跳过
+                    $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_FAIL],['id'=>$task_id]);
+                    DB::disconnect('custom_mysql');
+                    continue;
+                }
+                // 下载到 Laravel storage 的临时路径
+                $tempPath = storage_path('app/temp_url.xlsx');
+                file_put_contents($tempPath, file_get_contents($url));
+                // 载入 Excel
+                try {
+                    $spreadsheet = IOFactory::load($tempPath);
+                    $sheet = $spreadsheet->getActiveSheet();
+                    $rows = $sheet->toArray();
+                    unlink($tempPath);
+                }catch (\Exception $e){
+                    echo '文件打不开'.PHP_EOL;
+                    $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_FAIL],['id'=>$task_id]);
+                    DB::disconnect('custom_mysql');
+                    continue;
+                }
+                $dataRows = array_slice($rows, 1);
+                foreach ($dataRows as $item){
+                    //获取路由
+                    $route = trim($item[0],'/');
+                    $route = basename($route);
+                    $this->updateTdk($route,$item);
+                }
+                echo date('Y-m-d H:i:s').',end'.PHP_EOL;
+                $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_SUCCESS],['id'=>$task_id]);
+                DB::disconnect('custom_mysql');
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @remark :获取任务id
+     * @name   :getTaskId
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/2 11:19
+     */
+    public function getTaskId()
+    {
+        $task_id = Redis::rpop('update_project_tdk_task');
+        if (empty($task_id)) {
+            $noticeLogModel = new NoticeLog();
+            $ids = $noticeLogModel->selectField(['status'=>$noticeLogModel::STATUS_PENDING,'type'=>$noticeLogModel::TYPE_UPDATE_PROJECT_TDK],'id');
+             if(!empty($ids)){
+                foreach ($ids as $id) {
+                    Redis::lpush('update_project_tdk_task', $id);
+                }
+            }
+            $task_id = Redis::rpop('update_project_tdk_task');
+        }
+        return $task_id;
+    }
+
+    /**
+     * @remark :更新tdk
+     * @name   :updateTdk
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/2 14:59
+     */
+    public function updateTdk($route,$item){
+        $routeMapModel = new RouteMap();
+        $routeInfo = $routeMapModel->read(['route'=>$route]);
+        if($routeInfo === false){
+            return false;
+        }
+        switch ($routeInfo['source']){
+            case $routeMapModel::SOURCE_PRODUCT:
+                $productModel = new Product();
+                $productModel->edit(['seo_mate'=>json_encode(['title'=>$item[1],'description'=>$item[2],'keyword'=>$item[3]])],['id'=>$routeInfo['source_id']]);
+                break;
+            case $routeMapModel::SOURCE_PRODUCT_CATE:
+                $productCategoryModel = new Category();
+                $productCategoryModel->edit(['seo_title'=>$item[1],'seo_des'=>$item[2],'seo_keywords'=>$item[3]],['id'=>$routeInfo['source_id']]);
+                break;
+            case $routeMapModel::SOURCE_PRODUCT_KEYWORD:
+                $productKeywordModel = new Keyword();
+                $productKeywordModel->edit(['seo_title'=>$item[1],'seo_description'=>$item[2],'seo_keywords'=>$item[3]],['id'=>$routeInfo['source_id']]);
+                break;
+            case $routeMapModel::SOURCE_BLOG:
+                $blogModel = new Blog();
+                $blogModel->edit(['seo_title'=>$item[1],'seo_description'=>$item[2],'seo_keywords'=>$item[3]],['id'=>$routeInfo['source_id']]);
+                break;
+            case $routeMapModel::SOURCE_BLOG_CATE:
+                $blogCateModel = new BlogCategory();
+                $blogCateModel->edit(['seo_title'=>$item[1],'seo_des'=>$item[2],'seo_keywords'=>$item[3]],['id'=>$routeInfo['source_id']]);
+                break;
+            case $routeMapModel::SOURCE_NEWS:
+                $newsModel = new News();
+                $newsModel->edit(['seo_title'=>$item[1],'seo_description'=>$item[2],'seo_keywords'=>$item[3]],['id'=>$routeInfo['source_id']]);
+                break;
+            case $routeMapModel::SOURCE_NEWS_CATE:
+                $newsCateModel = new NewsCategory();
+                $newsCateModel->edit(['seo_title'=>$item[1],'seo_des'=>$item[2],'seo_keywords'=>$item[3]],['id'=>$routeInfo['source_id']]);
+                break;
+            case $routeMapModel::SOURCE_MODULE:
+                $contentModel = new CustomModuleContent();
+                $contentModel->edit(['seo_title'=>$item[1],'seo_description'=>$item[2],'seo_keywords'=>$item[3]],['id'=>$routeInfo['source_id']]);
+                break;
+            case $routeMapModel::SOURCE_MODULE_CATE:
+                $categoryModel = new CustomModuleCategory();
+                $categoryModel->edit(['seo_title'=>$item[1],'seo_description'=>$item[2],'seo_keywords'=>$item[3]],['id'=>$routeInfo['source_id']]);
+                break;
+            default:
+                break;
+        }
+        return true;
+    }
+}

@@ -260,7 +260,7 @@ class UpdateSeoTdk extends Command
             'url' => [],
             'language'=> [],
         ];
-        NoticeLog::createLog(NoticeLog::GENERATE_PAGE, json_encode(['c_url'=>$url,'c_params'=>$param]),date('Y-m-d H:i:s',time()+300));
+        NoticeLog::createLog(NoticeLog::GENERATE_PAGE, ['c_url'=>$url,'c_params'=>$param],date('Y-m-d H:i:s',time()+300));
 //        http_post($url, json_encode($param));
         echo getmypid() . ' '  . '更新中请稍后, 更新完成将会发送站内信通知更新结果！'. PHP_EOL;
     }

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\WorkOrder;
 
 use App\Http\Controllers\Api\BaseController;
+use App\Http\Requests\Api\WorkOrder\TicketListRequest;
 use App\Http\Requests\Api\WorkOrder\TicketStoreRequest;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
@@ -17,8 +18,9 @@ class TicketController extends BaseController
      *
      * @return \Illuminate\Http\Response
      */
-    public function index($project_id, Request $request)
+    public function index(TicketListRequest $request, $project_id)
     {
+        $validated = $request->validated();
         $project = TicketProject::where('uuid', $project_id)->first();
         if (!$project) return $this->error('未找到项目', 404);
         $page = (int)$request->input('page', 1);
@@ -30,6 +32,22 @@ class TicketController extends BaseController
         ])
             ->where('project_id', $project->id)
 //            ->where('submit_side', 2)
+            ->when($request->input('status') !== null, function ($query) use ($request) {
+                // status 查 gl_tickets.status
+                $status = $request->input('status');
+                return $query->where('status', $status);
+            })
+            ->when($request->input('search'), function ($query) use ($request) {
+                // search 查 gl_tickets.title 或 gl_ticket_projects.title 或 gl_ticket_projects.company_name
+                $search = $request->input('search');
+                return $query->where(function ($q) use ($search) {
+                    $q->where('title', 'like', '%' . $search . '%')
+                        ->orWhereHas('project', function ($q1) use ($search) {
+                            $q1->where('title', 'like', '%' . $search . '%')
+                                ->orWhere('company_name', 'like', '%' . $search . '%');
+                        });
+                });
+            })
             ->orderBy('id', 'desc')
             ->paginate($size, ['*'], 'page', $page);
         return response()->json(['data' => $tickets]);

@@ -1259,4 +1259,23 @@ class ProjectController extends BaseController
         NoticeLog::createLog(NoticeLog::TYPE_GENERATE_COUNT_CHARTS, ['project_id' => $this->param['project_id']]);
         $this->response('success');
     }
+
+    /**
+     * @remark :更新项目tdk
+     * @name   :updateTdk
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/2 11:04
+     */
+    public function updateTdk(){
+        $this->request->validate([
+            'project_id'=>'required',
+            'url'=>'required'
+        ],[
+            'project_id.required' => '项目id不能为空',
+            'url.required' => '文件路径不为空',
+        ]);
+        NoticeLog::createLog(NoticeLog::TYPE_UPDATE_PROJECT_TDK, ['project_id' => $this->param['project_id'],'url'=>$this->param['url']]);
+        $this->response('success',Code::SUCCESS,['url'=>$this->param['url']]);
+    }
 }

@@ -8,6 +8,8 @@ use App\Http\Requests\Aside\WorkOrder\AsideTicketStoreRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketListRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
 use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
+use App\Models\ProjectAssociation\ProjectAssociation;
+use App\Models\Workchat\MessagePush;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
@@ -216,4 +218,45 @@ class AsideTicketController extends BaseController
     {
         //
     }
+
+
+    /**
+     * 手动触发，推送工单到企微群
+     */
+    public function pushNotify($id)
+    {
+        $project = TicketProject::where('uuid', $id)
+            ->where('is_del', 0)
+            ->first();
+
+        if (empty($project))
+            $this->response('工单项目不存在', Code::USER_MODEL_NOTFOUND_ERROE);
+
+        if (empty($project->association)) {
+            $this->response('该工单没有绑定的企微群', Code::USER_MODEL_NOTFOUND_ERROE);
+        }
+
+        $ticket = Tickets::where('project_id', $project->id)
+            ->orderBy('id', 'desc')
+            ->first();
+
+        $message_push = new MessagePush();
+        $message_push->project_id = $project->table_id;
+        $message_push->friend_id = $project->association->friend_id;
+        $message_push->content_type = 'Link';
+        $message_push->content = json_encode([
+            'title' => '工单查看 - ' . $project->company_name,
+            'desc' => $ticket ? $ticket->title : "工单列表",
+            'size' => 0,
+            'thumbSize' => 0,
+            'thumbUrl' => 'https://oa.quanqiusou.cn/logo.ico',
+            'url' => 'https://oa.quanqiusou.cn/afterorder?project_id='.$project->uuid
+        ], JSON_UNESCAPED_UNICODE);
+        $message_push->send_time = now();
+        $message_push->type = MessagePush::TYPE_TICKET;
+        $message_push->save();
+        $ticket->ding = 1; // 标记为已推送
+        $ticket->save();
+        $this->response('success', Code::SUCCESS);
+    }
 }

@@ -304,7 +304,7 @@ class CNoticeController extends BaseController
             try {
                 http_post($c_url, json_encode($c_param));
             }catch (\Exception $e){
-                NoticeLog::createLog(NoticeLog::GENERATE_PAGE, json_encode(['c_url'=>$c_url,'c_params'=>$c_param]));
+                NoticeLog::createLog(NoticeLog::GENERATE_PAGE, ['c_url'=>$c_url,'c_params'=>$c_param]);
             }
         }
         $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');

@@ -17,7 +17,7 @@ use App\Models\RankData\RankDataBmseo;
 use App\Models\SeoSetting\LinkData;
 
 /**
- * @remark :报表详情数据
+ * @remark :白帽seo报表详情数据(权威评分)
  * @name   :AuthorityScoreLogic
  * @author :lyh
  * @method :post

+<?php
+
+namespace App\Http\Requests\Api\WorkOrder;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class TicketListRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'status' => 'nullable|in:0,1,2,3|integer',
+            'search' => 'nullable|string', // 搜索关键词
+            'page' => 'nullable|integer',
+            'size' => 'nullable|integer',
+        ];
+    }
+}

@@ -15,6 +15,7 @@ class NoticeLog extends Base
     const TYPE_INIT_PROJECT = 'init_project';
     const TYPE_INIT_KEYWORD_COMMENT = 'init_keyword_comment';//聚合页关键词评论
     const TYPE_GENERATE_COUNT_CHARTS = 'generate_count_charts';//聚合页关键字图表生成
+    const TYPE_UPDATE_PROJECT_TDK = 'updated_project_tdk';//根据路由更新tdk
     const TYPE_COPY_PROJECT = 'copy_project';
     const TYPE_INIT_KEYWORD = 'init_keyword';
     const DELETE_PRODUCT_CATEGORY = 'delete_product_category';

@@ -5,6 +5,7 @@ namespace App\Models\WorkOrder;
 use App\Models\Base;
 use App\Models\Manage\Manage;
 use App\Models\Project\Project;
+use App\Models\ProjectAssociation\ProjectAssociation;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class TicketProject extends Base
@@ -41,4 +42,15 @@ class TicketProject extends Base
         return $this->hasOne(Manage::class, 'id', 'engineer_id')
             ->select(['id', 'name']);
     }
+
+    /**
+     * 绑定的企微群
+     */
+    public function association()
+    {
+        return $this->hasOne(ProjectAssociation::class, 'project_id', 'table_id')
+            ->where('status', 1)
+            ->where('binding_app', ProjectAssociation::ENTERPRISE_WECHAT)
+            ->select(['id', 'project_id', 'friend_id', 'binding_app']);
+    }
 }

@@ -204,6 +204,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/updateProjectManager', [Aside\Project\ProjectController::class, 'updateProjectManager'])->name('admin.project_updateProjectManager');//更改项目人员配置
         Route::any('/setIsParticiple', [Aside\Project\ProjectController::class, 'setIsParticiple'])->name('admin.project_setIsParticiple');//开启/关闭分词
         Route::any('/saveSiteStatus', [Aside\Project\ProjectController::class, 'saveSiteStatus'])->name('admin.project_saveSiteStatus');
+        Route::any('/updateTdk', [Aside\Project\ProjectController::class, 'updateTdk'])->name('admin.project_updateTdk');//更新项目tdk
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
@@ -254,6 +255,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单');
         Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情');
         Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核，邀请同事');
+        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::get('/v56_projects/list', [Aside\WorkOrder\AsideTicketController::class, 'projectList'])->name('admin.tickets.projectList')->summary('A端V5V6项目列表');
         Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单');