合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3030

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingsTask.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/27 14:12
+ */
+
+namespace App\Console\Commands\Geo;
+
+use App\Helper\Gpt;
+use App\Models\Geo\GeoWritings;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Redis;
+use App\Models\Geo\GeoWritingsTask as GeoWritingsTaskModel;
+
+class GeoWritingsTask extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'geo_writings_task';
+
+    public $porject_id;//记录当时执行的project_id
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'geoAi生成文章';
+
+    public function handle(){
+        while (true){
+            $geoWritingsTaskModel = new GeoWritingsTaskModel();
+            $task_id = $this->getTaskId();
+            if(empty($task_id)){
+                sleep(60);
+                continue;
+            }
+            echo date("Y-m-d H:i:s").',执行的任务id'.$task_id.PHP_EOL;
+            $info = $geoWritingsTaskModel->read(['id'=>$task_id]);
+            if($info === false){
+                echo date("Y-m-d H:i:s").',任务id数据不存在：'.$task_id.PHP_EOL;
+                continue;
+            }
+            //生成引言
+            $aiCommand1 = "请根据这个文章标题:{$info['title']}，并同时参考公司的介绍’{$info['description']}‘以及公司参与的事件内容’{$info['event_content']}‘，给我写一个英文Press Release前言内容，前言内容请参考并引用{$info['keyword']}行业的一些专业数据报告，只需要1个段落，大约150-200字，请一定要出现这个关键词“{$info['prefix']}{$info['keyword']}{$info['suffix']}”，所有内容一定要用英文， 只需要回复我引言内容，不需要别的内容(比如序号、你的提示、寒暄、解释、注释之类的)。";
+            $gptHelper = new Gpt();
+            $introduction = $gptHelper->openai_chat_qqs($aiCommand1);
+            //生成内容
+            $aiCommand2 = "请根据这个文章标题:{$info['title']}，并同时参考公司的介绍{$info['description']},以及公司参与的事件内容{$info['event_content']}，给我写一篇英文Press Release内容正文(已经有前言内容了)，内容请参考并引用“{$info['prefix']}{$info['keyword']}{$info['suffix']}”行业的一些专业数据报告，新闻内容需要 5-6 个大纲，每个大纲需要标题和 1-2 段内容，最后1-2个大纲主要介绍企业的核心优势、主营产品应用场景、主要客户案例，并最后附带内容{$info['footer']}，最后只需要回复我新闻稿内容，整个新闻稿内容字数1000字左右，不需要别的内容(比如序号、你的提示、寒暄、解释、注释之类的)。";
+            $main = $gptHelper->openai_chat_qqs($aiCommand2);
+            $images = explode(',',$info['img']);
+            //组装一条数据
+            try {
+                $geoWritingsModel = new GeoWritings();
+                $saveData = [
+                    'project_id'=>$info['project_id'],
+                    'type'=>$geoWritingsModel::TYPE_AI_CREATE,
+                    'title'=>$info['title'],
+                    'content'=>$introduction.($images[0] ?? '').PHP_EOL.$main.($images[1] ?? ''),
+                    'content_length'=>strlen($introduction.PHP_EOL.$main),
+                    'uniqid'=>md5(uniqid().$task_id.$info['project_id']),
+                ];
+                $id = $geoWritingsModel->addReturnId($saveData);
+                $data = [
+                    'introduction'=>$introduction,
+                    'main'=>$main,
+                    'status'=>2,
+                    'writings_id'=>$id,
+                ];
+                $geoWritingsTaskModel->edit($data,['task_id'=>$task_id]);
+            }catch (\Exception $e){
+                echo date('Y-m-d H:i:s').'保存失败：'.$task_id.$e->getMessage().PHP_EOL;
+                continue;
+            }
+        }
+    }
+
+    /**
+     * @remark :获取任务id
+     * @name   :getTaskId
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/27 14:22
+     */
+    public function getTaskId(){
+        $task_id = Redis::rpop('geo_writings_task');
+        $geoWritingsTaskModel = new GeoWritingsTaskModel();
+        if (empty($task_id)) {
+            $ids = $geoWritingsTaskModel->formatQuery(['status'=>0])->limit(100)->pluck('id');
+            if(!empty($ids)){
+                foreach ($ids as $id) {
+                    Redis::lpush('geo_writings_task', $id);
+                }
+                $task_id = Redis::rpop('geo_writings_task');
+            }
+        }else{
+            $geoWritingsTaskModel->edit(['status'=>1],['id'=>$task_id]);
+        }
+        return $task_id;
+    }
+}

@@ -39,7 +39,7 @@ class GeoController extends BaseController
         $projectModel = new Project();
         $projectModel = new Project();
         $projectInfo = $projectModel->read(['project_id' => $project_id],['title','version']);
         $projectInfo = $projectModel->read(['project_id' => $project_id],['title','version']);
         $geoWritingsModel = new GeoWritings();
         $geoWritingsModel = new GeoWritings();
-        $lists  = $geoWritingsModel->list(['project_id' => $project_id, 'is_del' => GeoWritings::IS_DEL_FALSE],'id',['title', 'status', 'uniqid', 'confirm_at']);
+        $lists  = $geoWritingsModel->list(['project_id' => $project_id, 'status' => 2 ,'is_del' => GeoWritings::IS_DEL_FALSE],'id',['title', 'status', 'uniqid', 'confirm_at']);
         $result = [
         $result = [
             'project' => $projectInfo,
             'project' => $projectInfo,
             'list' => $lists
             'list' => $lists
@@ -66,9 +66,9 @@ class GeoController extends BaseController
      * @param Request $request
      * @param Request $request
      * @return false|string
      * @return false|string
      */
      */
-    public function confirmWritings(Request $request)
+    public function confirmWritings()
     {
     {
-        $request->validate([
+        $this->request->validate([
             'token' => 'required',
             'token' => 'required',
             'title' => 'required|max:120',
             'title' => 'required|max:120',
             'content' => 'required|max:5000'
             'content' => 'required|max:5000'
@@ -79,19 +79,21 @@ class GeoController extends BaseController
             'content.required' => '内容不能为空',
             'content.required' => '内容不能为空',
             'content.max' => '内容过长保存失败',
             'content.max' => '内容过长保存失败',
         ]);
         ]);
-        $token = trim($request->input('token'));
-        $data = GeoWritings::where(['uniqid' => $token])->first();
-        if (empty($data)){
+        $token = trim($this->param['token']);
+        $geoWritingsModel = new GeoWritings();
+        $info = $geoWritingsModel->read(['uniqid' => $token]);
+        if ($info === false){
             return $this->error('非法请求');
             return $this->error('非法请求');
         }
         }
-
-        if ($data->status != GeoWritings::STATUS_RUNNING){
+        if ($info['status'] == GeoWritings::STATUS_FINISH){
             return $this->error('当前文章已确认，不可再次确认');
             return $this->error('当前文章已确认，不可再次确认');
         }
         }
-
-
-        // FIXME 验证完成，保存数据，计算内容长度，处理内容中的资源， IP 确认时间 状态
-        return $data;
+        $this->param['confirm_ip'] = $this->request->ip();
+        $this->param['confirm_at'] = date('Y-m-d H:i:s');
+        $this->param['content_length'] = strlen($this->param['content']);
+        $this->param['status'] = GeoWritings::STATUS_FINISH;
+        $geoWritingsModel->edit($this->param,['uniqid' => $token]);
+        return true;
     }
     }
 
 
     /**
     /**

@@ -13,6 +13,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Geo\GeoWritingsLogic;
 use App\Http\Logic\Aside\Geo\GeoWritingsLogic;
 use App\Http\Requests\Aside\Geo\GeoWritingsRequest;
 use App\Http\Requests\Aside\Geo\GeoWritingsRequest;
+use App\Models\Geo\GeoWritings;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 /**
 /**
@@ -74,4 +75,20 @@ class GeoWritingsController extends BaseController
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
+    /**
+     * @remark :推送待审核列表消息
+     * @name   :sendMessage
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/28 09:59
+     */
+    public function sendWechatMessage(){
+        $this->request->validate([
+            'project_id'=>'required',
+        ],[
+            'project_id.required' => '项目ID不能为空',
+        ]);
+        $data = $this->logic->sendWechatMessage();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -49,9 +49,7 @@ class GeoWritingsLogic extends BaseLogic
      */
      */
     public function saveWriting(){
     public function saveWriting(){
         try {
         try {
-            $this->param['content_length'] = strlen($this->param['content']);
-            $this->param['confirm_ip'] = $this->request->ip();
-            $this->param['confirm_at'] = date('Y-m-d H:i:s');
+            $this->param['status'] = GeoWritings::STATUS_INIT;
             if(isset($this->param['id']) &&!empty($this->param['id'])){
             if(isset($this->param['id']) &&!empty($this->param['id'])){
                 $id = $this->param['id'];
                 $id = $this->param['id'];
                 $this->model->edit($this->param,['id'=>$id]);
                 $this->model->edit($this->param,['id'=>$id]);
@@ -80,4 +78,18 @@ class GeoWritingsLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :推送微信
+     * @name   :sendWechatMessage
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/28 10:15
+     */
+    public function sendWechatMessage()
+    {
+        $this->model->edit(['status'=>2],['status'=>1,'project_id'=>$this->param['project_id']]);
+        GeoWritings::sendConfirmMessage($this->param['project_id']);
+        return $this->success();
+    }
 }
 }

@@ -26,7 +26,7 @@ class NewsRequest extends FormRequest
         return [
         return [
             'name'=>'required|max:200',
             'name'=>'required|max:200',
             'url'=>'required',
             'url'=>'required',
-            'seo_title' => 'max:70',
+//            'seo_title' => 'max:70',
             'seo_keywords' => 'max:300',
             'seo_keywords' => 'max:300',
             'seo_description' => 'max:200',
             'seo_description' => 'max:200',
         ];
         ];
@@ -38,7 +38,7 @@ class NewsRequest extends FormRequest
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
             'name.max'=>'名称超过最长长度200',
             'name.max'=>'名称超过最长长度200',
             'url.required'=>'链接不能为空',
             'url.required'=>'链接不能为空',
-            'seo_title.max' => 'SEO标题不能超过70个字符',
+//            'seo_title.max' => 'SEO标题不能超过70个字符',
             'seo_keywords.max' => 'SEO关键词不能超过300个字符',
             'seo_keywords.max' => 'SEO关键词不能超过300个字符',
             'seo_description.max' => 'SEO描述不能超过200个字符',
             'seo_description.max' => 'SEO描述不能超过200个字符',
         ];
         ];

@@ -113,5 +113,6 @@ Route::prefix('geo')->group(function () {
     Route::any('/getWritingsList', [\App\Http\Controllers\Api\GeoController::class, 'getWritingsList'])->name('geo.getWritingsList');//确认文章数据
     Route::any('/getWritingsList', [\App\Http\Controllers\Api\GeoController::class, 'getWritingsList'])->name('geo.getWritingsList');//确认文章数据
     Route::any('/getWritingsDetail', [\App\Http\Controllers\Api\GeoController::class, 'getWritingsDetail'])->name('geo.getWritingsDetail');//文章数据详情
     Route::any('/getWritingsDetail', [\App\Http\Controllers\Api\GeoController::class, 'getWritingsDetail'])->name('geo.getWritingsDetail');//文章数据详情
     Route::any('/saveConfirm', [\App\Http\Controllers\Api\GeoController::class, 'saveConfirm'])->name('geo.saveConfirm');//保存用户确认信息
     Route::any('/saveConfirm', [\App\Http\Controllers\Api\GeoController::class, 'saveConfirm'])->name('geo.saveConfirm');//保存用户确认信息
+    Route::any('/getWritingsList', [\App\Http\Controllers\Api\GeoController::class, 'getWritingsList'])->name('geo.getWritingsList');//保存用户确认信息
 });
 });
 
 

@@ -607,6 +607,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/', [Aside\Geo\GeoWritingsController::class, 'lists'])->name('admin.geo_writing_task');
             Route::any('/', [Aside\Geo\GeoWritingsController::class, 'lists'])->name('admin.geo_writing_task');
             Route::any('/saveWriting', [Aside\Geo\GeoWritingsController::class, 'saveWriting'])->name('admin.geo_writing_saveWriting');
             Route::any('/saveWriting', [Aside\Geo\GeoWritingsController::class, 'saveWriting'])->name('admin.geo_writing_saveWriting');
             Route::any('/delWriting', [Aside\Geo\GeoWritingsController::class, 'delWriting'])->name('admin.geo_writing_delWriting');
             Route::any('/delWriting', [Aside\Geo\GeoWritingsController::class, 'delWriting'])->name('admin.geo_writing_delWriting');
+            Route::any('/sendWechatMessage', [Aside\Geo\GeoWritingsController::class, 'sendWechatMessage'])->name('admin.geo_writing_sendWechatMessage');
         });
         });
     });
     });
     // 任务相关
     // 任务相关