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

+<?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;
+    }
+}

@@ -124,6 +124,7 @@ class PostInquiryForward extends Command
                         if ($res) {
                         if ($res) {
                             $form = InquiryInfo::find($detail['form_id']);
                             $form = InquiryInfo::find($detail['form_id']);
                             $form->success = $form->success + 1;
                             $form->success = $form->success + 1;
+                            $form->timestamps = false;
                             $form->save();
                             $form->save();
                             Log::channel('inquiry_forward')->info('询盘成功：', [$detail['form_id'], $val->id, getmypid()]);
                             Log::channel('inquiry_forward')->info('询盘成功：', [$detail['form_id'], $val->id, getmypid()]);
                         }
                         }

@@ -1597,18 +1597,24 @@ if (!function_exists('httpGetSsl')) {
      * @time   :2025/9/22 14:46
      * @time   :2025/9/22 14:46
      */
      */
     function truncate_text($text, $limit = 300) {
     function truncate_text($text, $limit = 300) {
-        // 长度小于限制直接返回
         if (mb_strlen($text, 'UTF-8') <= $limit) {
         if (mb_strlen($text, 'UTF-8') <= $limit) {
             return $text;
             return $text;
         }
         }
-        // 先取前 $limit 个字符
         $truncated = mb_substr($text, 0, $limit, 'UTF-8');
         $truncated = mb_substr($text, 0, $limit, 'UTF-8');
-        // 如果这一段包含空格（说明有英文单词），尽量在最后一个空格处截断
+        // 优先找空格
         $lastSpace = mb_strrpos($truncated, ' ', 0, 'UTF-8');
         $lastSpace = mb_strrpos($truncated, ' ', 0, 'UTF-8');
-        if ($lastSpace !== false) {
-            // 在最后一个空格处截断，避免英文单词被截断
+        if ($lastSpace === false) {
+            // 没有空格则找 '-'
+            $lastDash = mb_strrpos($truncated, '-', 0, 'UTF-8');
+            if ($lastDash !== false && $lastDash > 0) {
+                $lastSpace = $lastDash;
+            }
+        }
+        if ($lastSpace !== false && $lastSpace > 0) {
             $truncated = mb_substr($truncated, 0, $lastSpace, 'UTF-8');
             $truncated = mb_substr($truncated, 0, $lastSpace, 'UTF-8');
         }
         }
         return $truncated;
         return $truncated;
     }
     }
+
+
 }
 }

@@ -7,6 +7,7 @@
  */
  */
 namespace App\Http\Controllers\Api;
 namespace App\Http\Controllers\Api;
 
 
+use App\Enums\Common\Code;
 use App\Models\Geo\GeoConfirm;
 use App\Models\Geo\GeoConfirm;
 use App\Models\Geo\GeoWritings;
 use App\Models\Geo\GeoWritings;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -35,13 +36,15 @@ class GeoController extends BaseController
         } catch (\Exception $e) {
         } catch (\Exception $e) {
             return $this->error('非法请求');
             return $this->error('非法请求');
         }
         }
-        $project = Project::select('title', 'version')->where(['project_id' => $this->param['project_id']])->first();
-        $list = GeoWritings::select(['title', 'status', 'uniqid', 'confirm_at'])->where(['project_id' => $project_id, 'is_del' => GeoWritings::IS_DEL_FALSE])->get();
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['project_id' => $project_id],['title','version']);
+        $geoWritingsModel = new GeoWritings();
+        $lists  = $geoWritingsModel->list(['project_id' => $project_id, 'status' => 2 ,'is_del' => GeoWritings::IS_DEL_FALSE],'id',['title', 'status', 'uniqid', 'confirm_at']);
         $result = [
         $result = [
-            'project' => $project,
-            'list' => $list
+            'project' => $projectInfo,
+            'list' => $lists
         ];
         ];
-        return $this->success($result);
+        $this->response('success',Code::SUCCESS,$result);
     }
     }
 
 
     /**
     /**
@@ -49,11 +52,12 @@ class GeoController extends BaseController
      * @param Request $request
      * @param Request $request
      * @return false|string
      * @return false|string
      */
      */
-    public function getWritingsDetail(Request $request)
+    public function getWritingsDetail()
     {
     {
-        $token = trim($request->input('token'));
-        $detail = GeoWritings::select(['title', 'content', 'status'])->where(['uniqid' => $token])->first();
-        return $this->success($detail);
+        $geoWritingsModel = new GeoWritings();
+        $token = trim($this->param['token']);
+        $detail = $geoWritingsModel->read(['uniqid' => $token],['title', 'content', 'status']);
+        $this->response('success',Code::SUCCESS,$detail);
     }
     }
 
 
 
 
@@ -62,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'
@@ -75,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;
     }
     }
 
 
     /**
     /**
@@ -95,9 +101,9 @@ class GeoController extends BaseController
      * @param Request $request
      * @param Request $request
      * @return false|string
      * @return false|string
      */
      */
-    public function getConfirm(Request $request)
+    public function getConfirm()
     {
     {
-        $token = trim($request->input('token'));
+        $token = trim($this->param['token']);
         $data = GeoConfirm::where(['uniqid' => $token])->first();
         $data = GeoConfirm::where(['uniqid' => $token])->first();
         if (empty($data)){
         if (empty($data)){
             return $this->error('当前授权已失效');
             return $this->error('当前授权已失效');
@@ -107,7 +113,7 @@ class GeoController extends BaseController
         $type = $data->type;
         $type = $data->type;
         $status = $data->status;
         $status = $data->status;
         $result = compact('content', 'confirm', 'type', 'status');
         $result = compact('content', 'confirm', 'type', 'status');
-        return $this->success($result);
+        $this->response('success',Code::SUCCESS,$result);
     }
     }
 
 
     /**
     /**
@@ -115,6 +121,20 @@ class GeoController extends BaseController
      * 验证当前确认数据状态， 不可重复确认
      * 验证当前确认数据状态， 不可重复确认
      * @param Request $request
      * @param Request $request
      */
      */
-    public function saveConfirm(Request $request)
-    {}
+    public function saveConfirm()
+    {
+        $this->request->validate([
+            'uniqid' => 'required',
+            'confirm' => 'required',
+            'confirm_num' => 'required',
+        ], [
+            'uniqid.required' => '非法请求',
+            'confirm.required' => '客户确认内容不能为空',
+            'confirm_num.max' => '客户确认数量不能为空',
+        ]);
+        $geoConfirmModel = new GeoConfirm();
+        $this->param['status'] = $geoConfirmModel::STATUS_FINISH;
+        $result = $geoConfirmModel->edit($this->param,['uniqid'=>$this->param['uniqid']]);
+        $this->response('success',Code::SUCCESS,$result);
+    }
 }
 }

@@ -23,8 +23,8 @@ use Illuminate\Http\Request;
  */
  */
 class GeoConfirmController extends BaseController
 class GeoConfirmController extends BaseController
 {
 {
-    public function __construct(){
-        parent::__construct();
+    public function __construct(Request $request){
+        parent::__construct($request);
         $this->logic = new GeoConfirmLogic();
         $this->logic = new GeoConfirmLogic();
     }
     }
 
 

@@ -24,8 +24,8 @@ use Illuminate\Http\Request;
  */
  */
 class GeoController extends BaseController
 class GeoController extends BaseController
 {
 {
-    public function __construct(){
-        parent::__construct();
+    public function __construct(Request $request){
+        parent::__construct($request);
         $this->logic = new GeoLogic();
         $this->logic = new GeoLogic();
     }
     }
 
 
@@ -68,16 +68,4 @@ class GeoController extends BaseController
         $data = $this->logic->saveConfig($this->param);
         $data = $this->logic->saveConfig($this->param);
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
-
-
-
-    /**
-     * OA后台管理员，保存确认数据
-     * 客户可以进行确认， OA后台也可以进行确认，以及修改
-     * @param Request $request
-     */
-    public function saveConfirmData(Request $request)
-    {
-
-    }
 }
 }

@@ -9,7 +9,12 @@
 
 
 namespace App\Http\Controllers\Aside\Geo;
 namespace App\Http\Controllers\Aside\Geo;
 
 
+use App\Enums\Common\Code;
+use App\Helper\Gpt;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Geo\GeoWritingsTaskLogic;
+use App\Http\Requests\Aside\Geo\GeoWritingsTaskRequest;
+use Illuminate\Http\Request;
 
 
 /**
 /**
  * @remark :文章任务（收集数据）
  * @remark :文章任务（收集数据）
@@ -20,14 +25,82 @@ use App\Http\Controllers\Aside\BaseController;
  */
  */
 class GeoWritingTaskController extends BaseController
 class GeoWritingTaskController extends BaseController
 {
 {
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->logic = new GeoWritingsTaskLogic();
+    }
+
     /**
     /**
-     * @remark :文章任务列表
+     * @remark :ai文章列表页
      * @name   :lists
      * @name   :lists
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2025/10/25 10:41
+     * @time   :2025/10/25 15:12
      */
      */
     public function lists(){
     public function lists(){
+        $data = $this->logic->listWritingTask($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :保存geoAi文章生成数据
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 10:41
+     */
+    public function saveWritingTask(){
+        $request = new GeoWritingsTaskRequest();
+        $request->validated();
+        $data = $this->logic->saveWritingTask();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 
 
+    /**
+     * @remark :批量删除文章任务
+     * @name   :delWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:03
+     */
+    public function delWritingTask(){
+        $this->request->validate([
+            'id'=>'required|array',
+        ],[
+            'id.required' => 'ID不能为空',
+            'id.array' => 'ID为数组',
+        ]);
+        $data = $this->logic->delWritingTask();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :Ai请求标题
+     * @name   :sendAiTitle
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/27 11:10
+     */
+    public function sendAiTitle(){
+        $this->request->validate([
+            'company'=>'required',
+            'number'=>'required',
+            'prefix'=>'required',
+            'keyword'=>'required',
+            'suffix'=>'required',
+            'event_title'=>'required',
+        ],[
+            'company.required' => '公司简称不能为空',
+            'number.required' => '生成数量不能为空',
+            'prefix.required' => '关键词前缀为数组',
+            'keyword.required' => '关键词不能为空',
+            'suffix.requiredrequired' => '关键词后缀不能为空',
+            'event_title.required' => '事件标题不能为空',
+        ]);
+        $aiCommand = "请根据公司简称{$this->param['company']}和这个公司产品的关键词:{$this->param['prefix']}{$this->param['keyword']}{$this->param['suffix']}，以及{$this->param['event_title']}，帮我写{$this->param['number']}个有吸引力的英文新闻标题;确保这个标题在Google上面唯一存在的，只需要回复我标题，不需要别的内容(比如序号、你的提示、寒暄、解释、注释之类的) 标题不能超过 100 字符数!,一行一个";
+        $gptHelper = new Gpt();
+        $data = $gptHelper->openai_chat_qqs($aiCommand);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -9,7 +9,12 @@
 
 
 namespace App\Http\Controllers\Aside\Geo;
 namespace App\Http\Controllers\Aside\Geo;
 
 
+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\Requests\Aside\Geo\GeoWritingsRequest;
+use App\Models\Geo\GeoWritings;
+use Illuminate\Http\Request;
 
 
 /**
 /**
  * @remark :geo文章
  * @remark :geo文章
@@ -20,5 +25,70 @@ use App\Http\Controllers\Aside\BaseController;
  */
  */
 class GeoWritingsController extends BaseController
 class GeoWritingsController extends BaseController
 {
 {
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->logic = new GeoWritingsLogic();
+    }
 
 
+    /**
+     * @remark :文章列表数据
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:53
+     */
+    public function lists(){
+        $data = $this->logic->listWriting($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :保存geoAi文章生成数据
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 10:41
+     */
+    public function saveWriting(){
+        $request = new GeoWritingsRequest();
+        $request->validated();
+        $data = $this->logic->saveWriting();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :批量删除文章任务
+     * @name   :delWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:03
+     */
+    public function delWriting(){
+        $this->request->validate([
+            'id'=>'required|array',
+        ],[
+            'id.required' => 'ID不能为空',
+            'id.array' => 'ID为数组',
+        ]);
+        $data = $this->logic->delWriting();
+        $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);
+    }
 }
 }

@@ -160,7 +160,7 @@ class OptimizeController extends BaseController
         $manageModel = new ManageHr();
         $manageModel = new ManageHr();
         $plan = Project::planMap();
         $plan = Project::planMap();
         $seo_plan = Project::seoMap();
         $seo_plan = Project::seoMap();
-        $item['plan'] = $plan[$item['plan']] ?? $seo_plan[1];
+        $item['plan'] = $plan[$item['plan']] ?? ($seo_plan[$item['seo_plan']] ?? '');
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);

@@ -9,10 +9,8 @@
 
 
 namespace App\Http\Logic\Aside\Geo;
 namespace App\Http\Logic\Aside\Geo;
 
 
-use App\Enums\Common\Code;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Geo\GeoConf;
 use App\Models\Geo\GeoConf;
-use App\Models\Geo\GeoQuestion;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
 use App\Models\Project\KeywordPrefix;
 use App\Models\Project\KeywordPrefix;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -67,7 +65,7 @@ class GeoLogic extends BaseLogic
                 'suffix' => KeywordPrefix::getKeyword($project_id, KeywordPrefix::TYPE_GEO_SUFFIX),
                 'suffix' => KeywordPrefix::getKeyword($project_id, KeywordPrefix::TYPE_GEO_SUFFIX),
             ],
             ],
         ];
         ];
-        $this->success($result);
+        return $this->success($result);
     }
     }
 
 
     /**
     /**

@@ -27,4 +27,69 @@ class GeoWritingsLogic extends BaseLogic
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
         $this->model = new GeoWritings();
         $this->model = new GeoWritings();
     }
     }
+
+    /**
+     * @remark :列表数据
+     * @name   :listWriting
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:57
+     */
+    public function listWriting($map,$page,$row,$order){
+        $data = $this->model->lists($map,$page,$row,$order);
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :手动上传数据
+     * @name   :saveWriting
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 16:07
+     */
+    public function saveWriting(){
+        try {
+            $this->param['status'] = GeoWritings::STATUS_INIT;
+            if(isset($this->param['id']) &&!empty($this->param['id'])){
+                $id = $this->param['id'];
+                $this->model->edit($this->param,['id'=>$id]);
+            }else{
+                $this->param['uniqid'] = uniqid().$this->param['project_id'];
+                $id = $this->model->addReturnId($this->param);
+            }
+        }catch (\Exception $e){
+            $this->fail('保存数据失败，请联系管理员'.$e->getMessage());
+        }
+        return $this->success(['id'=>$id]);
+    }
+
+    /**
+     * @remark :删除数据
+     * @name   :delWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:05
+     */
+    public function delWriting()
+    {
+        $res = $this->model->del(['id'=>['in',$this->param['id']]]);
+        if($res === false){
+            $this->fail('删除失败，请联系管理员');
+        }
+        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();
+    }
 }
 }

@@ -21,4 +21,55 @@ class GeoWritingsTaskLogic extends BaseLogic
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
         $this->model = new GeoWritingsTask();
         $this->model = new GeoWritingsTask();
     }
     }
+
+    /**
+     * @remark :
+     * @name   :listWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:13
+     */
+    public function listWritingTask($map,$page,$row,$order){
+        $data = $this->model->lists($map,$page,$row,$order);
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :保存AI文章数据
+     * @name   :saveWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 14:41
+     * @param  :project_id->项目ID;company->公司名称;brand->品牌词;keyword->关键词;prefix->前缀;suffix->后缀;event_title->事件标题;
+     * event_content->事件内容;title->标题;description->描述;footer->结尾引用;img->图片;ai_model->ai_model
+     */
+    public function saveWritingTask(){
+        try {
+            if(isset($this->param['id']) &&!empty($this->param['id'])){
+                $id = $this->param['id'];
+                $this->model->edit($this->param,['id'=>$id]);
+            }else{
+                $id = $this->model->addReturnId($this->param);
+            }
+        }catch (\Exception $e){
+            $this->fail('保存数据失败，请联系管理员'.$e->getMessage());
+        }
+        return $this->success(['id'=>$id]);
+    }
+
+    /**
+     * @remark :删除数据
+     * @name   :delWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:05
+     */
+    public function delWritingTask()
+    {
+        $res = $this->model->del(['id'=>['in',$this->param['id']]]);
+        if($res === false){
+            $this->fail('删除失败，请联系管理员');
+        }
+        return $this->success();
+    }
 }
 }

@@ -401,7 +401,7 @@ class InquiryForwardLogic extends BaseLogic
             $text = Translate::tran($text, $lang);
             $text = Translate::tran($text, $lang);
         }
         }
 
 
-        return $this->success(['ai_message' => Common::deal_str($text)]);
+        return $this->success(['ai_message' => str_replace('<br/>', PHP_EOL, Common::deal_str($text))]);
     }
     }
 
 
     /**
     /**

@@ -225,9 +225,7 @@ class NewsLogic extends BaseLogic
         if(isset($param['related_product_id'])){
         if(isset($param['related_product_id'])){
             $param['related_product_id'] = implode(',',$param['related_product_id']);
             $param['related_product_id'] = implode(',',$param['related_product_id']);
         }
         }
-        if(!isset($param['seo_title']) || empty($param['seo_title'])){
-            $param['seo_title'] = truncate_text($param['name'],70);
-        }
+        $param['seo_title'] = truncate_text($param['seo_title'] ?? $param['name'],70);
         return $this->success($param);
         return $this->success($param);
     }
     }
 
 

@@ -35,6 +35,9 @@ class WebSettingReceivingLogic extends BaseLogic
      */
      */
     public function setting_receiving_save(){
     public function setting_receiving_save(){
         $data = [];
         $data = [];
+        if(!isset($this->param['data']) || empty($this->param['data'])){
+            $this->fail('参数错误，请联系管理员');
+        }
         foreach ($this->param['data'] as  $v){
         foreach ($this->param['data'] as  $v){
             if($v['type'] == 1){
             if($v['type'] == 1){
                 // 使用正则表达式匹配中国大陆手机号
                 // 使用正则表达式匹配中国大陆手机号

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingsTaskRequest.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 14:21
+ */
+
+namespace App\Http\Requests\Aside\Geo;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class GeoWritingsRequest 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 [
+            'project_id' => 'required',
+            'title' => 'required|string',
+            'content' => 'required|string',
+        ];
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingsTaskRequest.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 14:21
+ */
+
+namespace App\Http\Requests\Aside\Geo;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class GeoWritingsTaskRequest 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 [
+            'project_id' => 'required',
+            'company' => 'required|string',
+            'brand' => 'required|string',
+            'keyword' => 'required|string',
+            'prefix' => 'required|string',
+            'suffix' => 'required|string',
+            'event_title' => 'required|string',
+            'event_content' => 'required|string',
+            'title' => 'required|string|max:120',
+            'description' => 'required|string',
+            'footer' => 'required|string',
+            'img' => 'required|string',
+            'ai_model' => 'required|string',
+        ];
+    }
+}

@@ -84,7 +84,7 @@ class RouteMap extends Base
         }
         }
         $length = strlen($sign);
         $length = strlen($sign);
         if($length > $route_len){
         if($length > $route_len){
-            $sign = trim(mb_substr($sign, 0, $route_len, 'UTF-8'),'-');
+            $sign = truncate_text($sign,$route_len);
         }
         }
         $i=1;//路由重复时拼接
         $i=1;//路由重复时拼接
         $route = $sign.$suffix;
         $route = $sign.$suffix;

@@ -509,6 +509,14 @@ class SyncSubmitTaskService
             throw new InquiryFilterException( '被刷数据');
             throw new InquiryFilterException( '被刷数据');
         }
         }
 
 
+        //3373江苏石川岛丰东真空 ip荷兰 name >8 纯字母不含空格
+        if($project_id == 3373 && in_array($data['country']??'', ['荷兰', '俄罗斯'])
+            && strlen($data['data']['name']??"") >= 8
+            && preg_match('/^[a-zA-Z]+$/', $data['data']['name']??'')
+        ){
+            throw new InquiryFilterException( '被刷数据');
+        }
+
         //数据都是空的
         //数据都是空的
         $is_all_empty = true;
         $is_all_empty = true;
         foreach ($data['data'] as $item){
         foreach ($data['data'] as $item){

@@ -110,5 +110,10 @@ Route::prefix('ticket_upload')->group(function () {
 //geo设置
 //geo设置
 Route::prefix('geo')->group(function () {
 Route::prefix('geo')->group(function () {
     Route::any('/getConfirm', [\App\Http\Controllers\Api\GeoController::class, 'getConfirm'])->name('geo.getConfirm');
     Route::any('/getConfirm', [\App\Http\Controllers\Api\GeoController::class, 'getConfirm'])->name('geo.getConfirm');
+    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('/saveConfirm', [\App\Http\Controllers\Api\GeoController::class, 'saveConfirm'])->name('geo.saveConfirm');//保存用户确认信息
+    Route::any('/getWritingsList', [\App\Http\Controllers\Api\GeoController::class, 'getWritingsList'])->name('geo.getWritingsList');//文章确认列表
+    Route::any('/confirmWritings', [\App\Http\Controllers\Api\GeoController::class, 'confirmWritings'])->name('geo.confirmWritings');//确认文章信息
 });
 });
 
 

@@ -595,6 +595,20 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::prefix('confirm')->group(function () {
         Route::prefix('confirm')->group(function () {
             Route::any('/saveConfirmContent', [Aside\Geo\GeoConfirmController::class, 'saveConfirmContent'])->name('admin.geo_confirm_saveConfirmContent');
             Route::any('/saveConfirmContent', [Aside\Geo\GeoConfirmController::class, 'saveConfirmContent'])->name('admin.geo_confirm_saveConfirmContent');
         });
         });
+        //geoai文章任务管理
+        Route::prefix('writing_task')->group(function () {
+            Route::any('/', [Aside\Geo\GeoWritingTaskController::class, 'lists'])->name('admin.geo_writing_task_lists');
+            Route::any('/saveWritingTask', [Aside\Geo\GeoWritingTaskController::class, 'saveWritingTask'])->name('admin.geo_writing_task_saveWritingTask');
+            Route::any('/delWritingTask', [Aside\Geo\GeoWritingTaskController::class, 'delWritingTask'])->name('admin.geo_writing_task_delWritingTask');
+            Route::any('/sendAiTitle', [Aside\Geo\GeoWritingTaskController::class, 'sendAiTitle'])->name('admin.geo_writing_task_sendAiTitle');
+        });
+        //geo文章管理
+        Route::prefix('writing')->group(function () {
+            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('/delWriting', [Aside\Geo\GeoWritingsController::class, 'delWriting'])->name('admin.geo_writing_delWriting');
+            Route::any('/sendWechatMessage', [Aside\Geo\GeoWritingsController::class, 'sendWechatMessage'])->name('admin.geo_writing_sendWechatMessage');
+        });
     });
     });
     // 任务相关
     // 任务相关
     Route::prefix('task')->group(function () {
     Route::prefix('task')->group(function () {