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

@@ -41,18 +41,36 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        //获取
-        $keywordPrefixModel = new KeywordPrefix();
-        $lists = $keywordPrefixModel->list(['project_id'=>0,'id'=>['<',29]]);
-        $whiteModel = new ProjectWhiteHatAffix();
-        foreach ($lists as $val) {
-            echo date('Y-m-d H:i:s') . '开始--项目的id:' . $val['id'] . PHP_EOL;
+        return $this->aggregate_keyword_affix();
+    }
+
+    /**
+     * @remark :获取数据
+     * @name   :aggregate_keyword_affix
+     * @author :lyh
+     * @method :post
+     * @time   :2025/6/26 17:58
+     */
+    public function aggregate_keyword_affix(){
+        $projectModel = new Project();
+        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,4,6]]], 'id', ['id']);
+        $keywordAffixModel = new AggregateKeywordAffix();
+        foreach ($lists as $val){
+            $info = $keywordAffixModel->read(['project_id'=>$val['id']]);
+
+
+            $prefix = "How To find"."\n"."Why Choose"."\n"."China Top"."\n"."Best Way To Choose"."\n"."Methods To Choose";
+            $suffix = "Manufacturer"."\n"."Supplier"."\n"."Products"."\n"."Factory";
+            if($info === false){
+                echo '执行的项目id:'.$val['id'].PHP_EOL;
                 $data = [
                 $data = [
-                'project_id'=>0,
-                'name'=>$val['keyword'],
-                'type'=>$val['type'],
+                    'project_id'=>$val['id'],
+                    'prefix'=>$prefix,
+                    'suffix'=>$suffix,
                 ];
                 ];
-            $whiteModel->add($data);
+                $keywordAffixModel->addReturnId($data);
+            }
+
         }
         }
         return true;
         return true;
     }
     }

@@ -52,7 +52,7 @@ class GeneratePage extends Command
         $noticeModel = new NoticeLog();
         $noticeModel = new NoticeLog();
         while (true){
         while (true){
             $task_id = $this->getTaskId();
             $task_id = $this->getTaskId();
-            if (empty($noticeInfo)) {
+            if (empty($task_id)) {
                 sleep(10);
                 sleep(10);
                 continue;
                 continue;
             }
             }
@@ -90,16 +90,17 @@ class GeneratePage extends Command
      */
      */
     public function getTaskId()
     public function getTaskId()
     {
     {
-        $task_id = Redis::rpop('generate_page_id');
+        $task_id = Redis::rpop('generate_page');
+        echo '任务id:'.$task_id.PHP_EOL;
         if (empty($task_id)) {
         if (empty($task_id)) {
             $noticeModel = new NoticeLog();
             $noticeModel = new NoticeLog();
-            $ids = $noticeModel->selectField(['status'=>0],'id');
+            $ids = $noticeModel->selectField(['status'=>0,'type'=>NoticeLog::GENERATE_PAGE],'id');
             if(!empty($ids)){
             if(!empty($ids)){
                 foreach ($ids as $id) {
                 foreach ($ids as $id) {
-                    Redis::lpush('generate_page_id', $id);
+                    Redis::lpush('generate_page', $id);
                 }
                 }
             }
             }
-            $task_id = Redis::rpop('generate_page_id');
+            $task_id = Redis::rpop('generate_page');
         }
         }
         return $task_id;
         return $task_id;
     }
     }

@@ -77,7 +77,7 @@ class PushNotify extends Command
                     'desc' => $tick->title,
                     'desc' => $tick->title,
                     'size' => 0,
                     'size' => 0,
                     'thumbSize' => 0,
                     'thumbSize' => 0,
-                    'thumbUrl' => 'https://www.cmer.com/uploads/logo1.png',
+                    'thumbUrl' => 'https://oa.quanqiusou.cn/logo.ico',
                     'url' => 'https://oa.quanqiusou.cn/tickets?project_id='.$project->uuid
                     'url' => 'https://oa.quanqiusou.cn/tickets?project_id='.$project->uuid
                 ], JSON_UNESCAPED_UNICODE);
                 ], JSON_UNESCAPED_UNICODE);
                 $message_push->send_time = now();
                 $message_push->send_time = now();

@@ -44,6 +44,7 @@ class WorkOrderDing extends Command
             try {
             try {
                 $log = TicketLog::where('ding', 0)->first();
                 $log = TicketLog::where('ding', 0)->first();
                 if (!$log) {
                 if (!$log) {
+                    echo now() . " INFO | 没有通知任务\n";
                     sleep(3);
                     sleep(3);
                     continue;
                     continue;
                 }
                 }
@@ -69,7 +70,7 @@ class WorkOrderDing extends Command
                     $log->ding = 2;
                     $log->ding = 2;
                 $log->save();
                 $log->save();
             }catch (\Exception $exception){
             }catch (\Exception $exception){
-                echo date('Y-m-d H:i:s')." ".$exception->getMessage()."\n";
+                echo now() . " ERROR | ".$exception->getMessage()."\n";
                 break;
                 break;
             }
             }
         }
         }

@@ -56,9 +56,9 @@ class TicketChatController extends Controller
         $chat->content = $request->input('content');
         $chat->content = $request->input('content');
         $files = $request->input('files');
         $files = $request->input('files');
         if (empty($files) || (is_array($files) && count(array_filter($files, function($v){ return !is_null($v); })) === 0)) {
         if (empty($files) || (is_array($files) && count(array_filter($files, function($v){ return !is_null($v); })) === 0)) {
-            $ticket->files = null;
+            $chat->files = null;
         } else {
         } else {
-            $ticket->files = json_encode($files);
+            $chat->files = json_encode($files);
         }
         }
         $chat->submit_side = 2;
         $chat->submit_side = 2;
         $chat->submit_username = $request->input('submit_username');
         $chat->submit_username = $request->input('submit_username');

@@ -29,7 +29,7 @@ class TicketController extends BaseController
             'logs.engineer:id,name',
             'logs.engineer:id,name',
         ])
         ])
             ->where('project_id', $project->id)
             ->where('project_id', $project->id)
-            ->where('submit_side', 2)
+//            ->where('submit_side', 2)
             ->orderBy('id', 'desc')
             ->orderBy('id', 'desc')
             ->paginate($size, ['*'], 'page', $page);
             ->paginate($size, ['*'], 'page', $page);
         return response()->json(['data' => $tickets]);
         return response()->json(['data' => $tickets]);

@@ -7,6 +7,7 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketStoreRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketStoreRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketListRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketListRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
+use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
 use App\Models\WorkOrder\Tickets;
@@ -82,6 +83,32 @@ class AsideTicketController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @param TicketProjectListRequest $request
+     * @return void
+     * A端V5V6项目列表
+     */
+    public function projectList(TicketProjectListRequest $request)
+    {
+        $validated = $request->validated();
+        $lists = TicketProject::where('is_del', 0)
+            ->when(!empty($validated['search']), function ($query) use ($validated) {
+                // 查找项目名称或公司名称
+                $search = $validated['search'];
+                return $query->where(function ($q) use ($search) {
+                    $q->where('title', 'like', '%' . $search . '%')
+                        ->orWhere('company_name', 'like', '%' . $search . '%');
+                });
+            })
+            ->when(!empty($validated['version']), function ($query) use ($validated) {
+                // 版本号筛选
+                $version = $validated['version'];
+                return $query->where('version', $version);
+            })
+            ->paginate($this->row, ['*'], 'page', $this->page);
+        $this->response('success', Code::SUCCESS, $lists);
+    }
+
+    /**
      * Store a newly created resource in storage.
      * Store a newly created resource in storage.
      *
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Illuminate\Http\Request  $request

@@ -43,7 +43,7 @@ class TicketChatController extends BaseController
     public function store(TicketChatStoreRequest $request, $ticket_id)
     public function store(TicketChatStoreRequest $request, $ticket_id)
     {
     {
         $validated = $request->validated();
         $validated = $request->validated();
-        $ticket = Tickets::find($request->input('ticket_id'));
+        $ticket = Tickets::find($ticket_id);
         if (!$ticket) return response('工单未找到', 404);
         if (!$ticket) return response('工单未找到', 404);
         if ($ticket->project->is_del) return response('项目状态异常', 400);
         if ($ticket->project->is_del) return response('项目状态异常', 400);
 
 
@@ -51,11 +51,11 @@ class TicketChatController extends BaseController
         $chat->ticket_id = $ticket->id;
         $chat->ticket_id = $ticket->id;
         $chat->content = $validated['content'];
         $chat->content = $validated['content'];
 
 
-        $files = $validated['files'];
+        $files = $validated['files'] ?? [];
         if (empty($files) || (is_array($files) && count(array_filter($files, function($v){ return !is_null($v); })) === 0)) {
         if (empty($files) || (is_array($files) && count(array_filter($files, function($v){ return !is_null($v); })) === 0)) {
-            $ticket->files = null;
+            $chat->files = null;
         } else {
         } else {
-            $ticket->files = json_encode($files);
+            $chat->files = json_encode($files);
         }
         }
 
 
         $chat->submit_username = $this->manage['name'];
         $chat->submit_username = $this->manage['name'];

@@ -76,6 +76,6 @@ class EnterpriseProductLogic extends BaseLogic
             $linkModel->insertAll($data);
             $linkModel->insertAll($data);
         }
         }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
-        return $this->success(['success'=>'成功数量：'.$count-$error_num,'error'=>'失败数量：'.$error_num]);
+        return $this->success(['success'=>$count,'error'=>$error_num]);
     }
     }
 }
 }

+<?php
+
+namespace App\Http\Requests\Aside\WorkOrder;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class TicketProjectListRequest 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 [
+            'search' => 'nullable|string', // 搜索关键词
+            'version' => 'nullable|in:5,6', // 版本号
+        ];
+    }
+}

@@ -9,6 +9,7 @@
 namespace App\Services;
 namespace App\Services;
 
 
 use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModule;
+use App\Models\Project\AggregateKeywordAffix;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BCustomTemplate;
@@ -140,6 +141,8 @@ class ProjectServer
         self::initColumn();
         self::initColumn();
         //初始化search页面
         //初始化search页面
 //        self::initSearchPage($project_id);
 //        self::initSearchPage($project_id);
+        //聚合页关键词前后缀
+        self::initAggregateKeywordAffix($project_id);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         return true;
         return true;
     }
     }
@@ -280,4 +283,29 @@ class ProjectServer
             }
             }
         }
         }
     }
     }
+
+    /**
+     * @remark :gl_aggregate_keyword_affix处理聚合页关键词前后缀
+     * @name   :initAffix
+     * @author :lyh
+     * @method :post
+     * @time   :2025/6/26 17:48
+     */
+    public static function initAggregateKeywordAffix($project_id){
+        $time = date('Y-m-d H:i:s');
+        $prefix = "How To"."\n"."Why"."\n"."Top 5"."\n"."Top 3"."\n"."Best Way To"."\n"."Methods To"."\n"."Top-Rated"."\n"."How To find"."\n"."why choose"."\n"."China Top"."\n"."Best Way To Choose"."\n"."Methods To choose"."\n"."10 tips"."\n"."Top 10"."\n"."How To Select"."\n"."How To Find The Best"."\n"."How To Evaluate"."\n"."How To Compare"."\n"."How To Identify"."\n"."How To Source"."\n"."How To Pick The Right"."\n"."How To Decide Between"."\n"."Why Opt For"."\n"."Why Invest In"."\n"."Why Consider"."\n"."Why Trust"."\n"."Why Professionals Prefer"."\n"."Top Picks For"."\n"."Best Practices For"."\n"."Best Ways To"."\n"."Best Options For"."\n"."Best Brands For"."\n"."Best Methods To"."\n"."Best Strategies For"."\n"."Effective Ways To"."\n"."Proven Methods To"."\n"."Simple Ways To"."\n"."Key Methods For"."\n"."Smart Ways To"."\n"."Practical Methods To"."\n"."Step-by-Step Guide To"."\n"."10 Essential Tips For"."\n"."7 Key Tips To"."\n"."Ultimate Guide To"."\n"."Expert Tips For"."\n"."Must-Know Tips For"."\n"."Quick Tips To"."\n"."Insider Tips For"."\n"."Leading Chinese"."\n"."Best Chinese"."\n"."China’s Best-Selling"."\n"."Why China’s"."\n"."How Chinese Manufacturers"."\n"."Exploring"."\n"."Uncovering"."\n"."Discovering"."\n"."Pinpointing"."\n"."Decoding"."\n"."Reasons to Choose"."\n"."Advantages Explained"."\n"."Where the Value Lies"."\n"."Not to Be Missed"."\n"."Must-Choose Reasons"."\n"."Excellence in"."\n"."Cutting-Edge"."\n"."Premier"."\n"."Champions of"."\n"."The Ultimate Guide to"."\n"."Practical Strategies for"."\n"."Making Smart Choices"."\n"."Key Steps to Choosing"."\n"."Finding Your Perfect Match"."\n"."Avoiding Pitfalls"."\n"."Tips & Tricks for"."\n"."In-Depth Analysis of"."\n"."Methods"."\n"."How-To Guide"."\n"."Step-by-Step Guide"."\n"."The Secret to"."\n"."Must-See List"."\n"."Curated Selection of"."\n"."Trending"."\n"."Popular"."\n"."Don't Miss These"."\n"."Comprehensive Comparison of"."\n"."The Clear Choice of"."\n"."Today's Choice of"."\n"."Expert Choice of";
+        $suffix = "Manufacturer"."\n"."Supplier"."\n"."Application"."\n"."Products"."\n"."Service"."\n"."Factory"."\n"."Is The Best"."\n"."Stands Out"."\n"."Dominates"."\n"."in 2025"."\n"."Industry Leaders"."\n"."Industry Giant"."\n"."Market Leader"."\n"."For the Current Year"."\n"."Ahead of the Curve"."\n"."Trusted by Pros"."\n"."Pioneers in the Field"."\n"."Now Trending"."\n"."Sets the Industry Standard"."\n"."Leads the Global Market"."\n"."Delivers Unmatched Quality"."\n"."Guarantees Peak Performance"."\n"."Exceeds Industry Benchmarks"."\n"."Winning in 2025"."\n"."Where Innovation Meets 2025"."\n"."Your Trusted OEM Partner"."\n"."Supplies the World’s Top Brands"."\n"."Manufacturers You Can Rely On"."\n"."Factory-Direct Excellence"."\n"."Custom Solutions,"."\n"."Global Reach"."\n"."Where Service Meets Innovation"."\n"."Your End-to-End Solution"."\n"."More Than a Supplier - A Partner"."\n"."Service Backed by Expertise"."\n"."From Concept to Delivery"."\n"."Outperforms the Competition";
+        $info = DB::table('gl_aggregate_keyword_affix')->where('project_id',$project_id)->first();
+        if(empty($info)){
+            $data = [
+                'project_id'=>$project_id,
+                'prefix'=>$prefix,
+                'suffix'=>$suffix,
+                'created_at' => $time,
+                'updated_at' => $time
+            ];
+            DB::table('gl_aggregate_keyword_affix')->insert($data);
+        }
+        return true;
+    }
 }
 }

@@ -255,6 +255,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->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::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核，邀请同事');
         Route::get('/projects/{search}', [Aside\WorkOrder\AsideTicketController::class, 'getProjects'])->name('admin.tickets.projects')->summary('A端V5V6项目列表');
         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端工单操作日志更新,完成工单');
         Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单');
         Route::get('/chat/{ticket_id}', [Aside\WorkOrder\TicketChatController::class, 'index'])->name('admin.tickets.chat.index')->summary('A端工单聊天记录');
         Route::get('/chat/{ticket_id}', [Aside\WorkOrder\TicketChatController::class, 'index'])->name('admin.tickets.chat.index')->summary('A端工单聊天记录');
         Route::post('/chat/{ticket_id}', [Aside\WorkOrder\TicketChatController::class, 'store'])->name('admin.tickets.chat.store')->summary('A端工单聊天记录创建');
         Route::post('/chat/{ticket_id}', [Aside\WorkOrder\TicketChatController::class, 'store'])->name('admin.tickets.chat.store')->summary('A端工单聊天记录创建');