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

@@ -42,11 +42,14 @@ class GeoWritingsTask extends Command
                 continue;
                 continue;
             }
             }
             echo date("Y-m-d H:i:s").',执行的任务id'.$task_id.PHP_EOL;
             echo date("Y-m-d H:i:s").',执行的任务id'.$task_id.PHP_EOL;
-            $info = $geoWritingsTaskModel->read(['id'=>$task_id]);
+            $info = $geoWritingsTaskModel->read(['id'=>$task_id,'status'=>1]);
             if($info === false){
             if($info === false){
-                echo date("Y-m-d H:i:s").',任务id数据不存在：'.$task_id.PHP_EOL;
+                echo date("Y-m-d H:i:s").',任务id数据不存在/或已被执行：'.$task_id.PHP_EOL;
                 continue;
                 continue;
             }
             }
+            //修改状态为生成中
+            $geoWritingsModel = new GeoWritings();
+            $geoWritingsModel->edit(['status'=>$geoWritingsModel::STATUS_AI_RUNNING],['id'=>$info['writings_id']]);
             //生成引言
             //生成引言
             $aiCommand1 = "请根据这个文章标题:{$info['title']}，并同时参考公司的介绍’{$info['description']}‘以及公司参与的事件内容’{$info['event_content']}‘，给我写一个英文Press Release前言内容，前言内容请参考并引用{$info['keyword']}行业的一些专业数据报告，只需要1个段落，大约150-200字，请一定要出现这个关键词“{$info['prefix']}{$info['keyword']}{$info['suffix']}”，所有内容一定要用英文， 只需要回复我引言内容，不需要别的内容(比如序号、你的提示、寒暄、解释、注释之类的)。";
             $aiCommand1 = "请根据这个文章标题:{$info['title']}，并同时参考公司的介绍’{$info['description']}‘以及公司参与的事件内容’{$info['event_content']}‘，给我写一个英文Press Release前言内容，前言内容请参考并引用{$info['keyword']}行业的一些专业数据报告，只需要1个段落，大约150-200字，请一定要出现这个关键词“{$info['prefix']}{$info['keyword']}{$info['suffix']}”，所有内容一定要用英文， 只需要回复我引言内容，不需要别的内容(比如序号、你的提示、寒暄、解释、注释之类的)。";
             $gptHelper = new Gpt();
             $gptHelper = new Gpt();
@@ -57,21 +60,17 @@ class GeoWritingsTask extends Command
             $images = explode(',',$info['img']);
             $images = explode(',',$info['img']);
             //组装一条数据
             //组装一条数据
             try {
             try {
-                $geoWritingsModel = new GeoWritings();
                 $saveData = [
                 $saveData = [
-                    'project_id'=>$info['project_id'],
-                    'type'=>$geoWritingsModel::TYPE_AI_CREATE,
                     'title'=>$info['title'],
                     'title'=>$info['title'],
                     'content'=>$introduction.($images[0] ?? '').PHP_EOL.$main.($images[1] ?? ''),
                     'content'=>$introduction.($images[0] ?? '').PHP_EOL.$main.($images[1] ?? ''),
                     'content_length'=>strlen($introduction.PHP_EOL.$main),
                     'content_length'=>strlen($introduction.PHP_EOL.$main),
-                    'uniqid'=>md5(uniqid().$task_id.$info['project_id']),
+                    'status'=>$geoWritingsModel::STATUS_INIT
                 ];
                 ];
-                $id = $geoWritingsModel->addReturnId($saveData);
+                $geoWritingsModel->edit($saveData,['id'=>$info['writings_id']]);
                 $data = [
                 $data = [
                     'introduction'=>$introduction,
                     'introduction'=>$introduction,
                     'main'=>$main,
                     'main'=>$main,
                     'status'=>2,
                     'status'=>2,
-                    'writings_id'=>$id,
                 ];
                 ];
                 $geoWritingsTaskModel->edit($data,['id'=>$task_id]);
                 $geoWritingsTaskModel->edit($data,['id'=>$task_id]);
             }catch (\Exception $e){
             }catch (\Exception $e){
@@ -88,20 +87,34 @@ class GeoWritingsTask extends Command
      * @method :post
      * @method :post
      * @time   :2025/10/27 14:22
      * @time   :2025/10/27 14:22
      */
      */
-    public function getTaskId(){
+    public function getTaskId()
+    {
         $task_id = Redis::rpop('geo_writings_task');
         $task_id = Redis::rpop('geo_writings_task');
-        $geoWritingsTaskModel = new GeoWritingsTaskModel();
+        // 如果队列空了，尝试补充
         if (empty($task_id)) {
         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);
+            $lock_key = 'geo_writings_task_lock';
+            $lock_ttl = 10; // 锁过期时间10秒，防止死锁
+            $lock = Redis::set($lock_key, 1, 'EX', $lock_ttl, 'NX');
+            if ($lock) {
+                try {
+                    $geoWritingsTaskModel = new GeoWritingsTaskModel();
+                    $ids = $geoWritingsTaskModel->formatQuery(['status' => 0])->limit(100)->pluck('id');
+                    if (!$ids->isEmpty()) {
+                        // 标记这批任务为“生成中”
+                        $geoWritingsTaskModel->edit(['status' => 1], ['id' => ['in', $ids]]);
+                        foreach ($ids as $id) {
+                            Redis::lpush('geo_writings_task', $id);
+                        }
+                    }
+                } finally {
+                    // 释放锁
+                    Redis::del($lock_key);
                 }
                 }
+                // 再次从队列中取任务
                 $task_id = Redis::rpop('geo_writings_task');
                 $task_id = Redis::rpop('geo_writings_task');
             }
             }
-        }else{
-            $geoWritingsTaskModel->edit(['status'=>1],['id'=>$task_id]);
         }
         }
         return $task_id;
         return $task_id;
     }
     }
+
 }
 }

@@ -116,7 +116,7 @@ class SyncProject extends Command
                     }
                     }
                     $item->status = NoticeLog::STATUS_SUCCESS;
                     $item->status = NoticeLog::STATUS_SUCCESS;
                     $item->save();
                     $item->save();
-                    echo 'success:' . $item['id'] . '执行时间：' . date('Y-m-d H:i:s') . PHP_EOL;
+                    echo 'success:' . $item['id'] . '执行时间：'. 'ordet_id:'. $order_id . date('Y-m-d H:i:s') . PHP_EOL;
                 }catch (\Exception $e){
                 }catch (\Exception $e){
                     echo 'error:' . $item['id'] . $e->getMessage() .' line ' . $e->getLine() . '执行时间：' . PHP_EOL;
                     echo 'error:' . $item['id'] . $e->getMessage() .' line ' . $e->getLine() . '执行时间：' . PHP_EOL;
                     errorLog('项目同步失败', $item, $e);
                     errorLog('项目同步失败', $item, $e);

@@ -49,6 +49,11 @@ class GeoWritingsTaskLogic extends BaseLogic
                 $id = $this->param['id'];
                 $id = $this->param['id'];
                 $this->model->edit($this->param,['id'=>$id]);
                 $this->model->edit($this->param,['id'=>$id]);
             }else{
             }else{
+                //自动保存一条数据
+                $writingModel = new GeoWritings();
+                $this->param['writings_id'] = $writingModel->addReturnId(['project_id'=>$this->param['project_id'],
+                    'type'=>$writingModel::TYPE_AI_CREATE,'status'=>$writingModel::STATUS_AI_WAIT,
+                    'uniqid'=>md5(uniqid().rand(1, 99999).$this->param['project_id'])]);
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
             }
             }
         }catch (\Exception $e){
         }catch (\Exception $e){