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

变更数据



查看合并请求 !3012

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingTaskController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:40
+ */
+
+namespace App\Http\Controllers\Aside\Geo;
+
+use App\Http\Controllers\Aside\BaseController;
+
+/**
+ * @remark :文章任务（收集数据）
+ * @name   :GeoWritingTaskController
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:40
+ */
+class GeoWritingTaskController extends BaseController
+{
+    /**
+     * @remark :文章任务列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 10:41
+     */
+    public function lists(){
+
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingsController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:41
+ */
+
+namespace App\Http\Controllers\Aside\Geo;
+
+use App\Http\Controllers\Aside\BaseController;
+
+/**
+ * @remark :geo文章
+ * @name   :GeoWritingsController
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:41
+ */
+class GeoWritingsController extends BaseController
+{
+
+}

@@ -20,6 +20,7 @@ use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServersIp;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainCreateTask;
+use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\Geo\GeoArticle;
 use App\Models\Geo\GeoArticle;
 use App\Models\Geo\GeoConf;
 use App\Models\Geo\GeoConf;
@@ -225,7 +226,7 @@ class ProjectController extends BaseController
             if($this->map['domain_type'] == 'domain'){
             if($this->map['domain_type'] == 'domain'){
                 $parsedUrl = parse_url($this->map['domain_search']);
                 $parsedUrl = parse_url($this->map['domain_search']);
                 $this->map['domain_search'] = $parsedUrl['host'] ?? $this->map['domain_search'];
                 $this->map['domain_search'] = $parsedUrl['host'] ?? $this->map['domain_search'];
-                $ids = DomainInfo::where('domain', 'like', '%'.$this->map['domain_search'].'%')->pluck('id')->toArray();
+                $ids = DomainInfoModel::where('domain', 'like', '%'.$this->map['domain_search'].'%')->pluck('id')->toArray();
                 $query->whereIn('gl_project_deploy_optimize.domain', $ids);
                 $query->whereIn('gl_project_deploy_optimize.domain', $ids);
             }else{
             }else{
                 $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['domain_search'].'%');
                 $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['domain_search'].'%');
@@ -447,23 +448,6 @@ class ProjectController extends BaseController
         if(!empty($item['extend_type'])){
         if(!empty($item['extend_type'])){
             $item['type'] = $item['extend_type'];
             $item['type'] = $item['extend_type'];
         }
         }
-        $domainModel = new DomainInfoModel();
-        $item['domain'] = !empty($item['domain']) ?  $domainModel->getDomain($item['domain']) : '';
-        $item['uuid'] = TicketProject::where('table_id', $item['id'])->where('project_cate', 2)->value('uuid') ?? null;
-        $item['friend_id'] = ProjectAssociation::where('project_id', $item['id'])->where('status', ProjectAssociation::STATUS_NORMAL)->where('binding_app', ProjectAssociation::ENTERPRISE_WECHAT)->value('friend_id') ?? null;
-        $planMap = Project::planMap();
-        $seoPlanMap = Project::seoMap();
-        $item['plan'] = $planMap[$item['plan']] ?? '';
-        $item['seo_plan'] = $seoPlanMap[$item['seo_plan']] ?? '';
-        $item['autologin_code'] = getAutoLoginCode($item['id']);
-        $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date']));
-        $item['product_num'] = $data['product'] ?? 0;
-        $item['keyword_num'] = $data['key'] ?? 0;
-        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
-        $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
-        $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
-        $item['collect_time'] = $item['is_upgrade'] ? UpdateLog::getProjectUpdate($item['id']) : '';
-        $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $manageModel = new ManageHr();
         $manageModel = new ManageHr();
         //geo项目
         //geo项目
         if(($item['plan'] == 0) && ($item['seo_plan'] != 0)){
         if(($item['plan'] == 0) && ($item['seo_plan'] != 0)){
@@ -487,6 +471,23 @@ class ProjectController extends BaseController
             $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']);
             $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']);
             $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']);
             $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']);
             $item['quality_mid_name'] = $manageModel->getName($item['quality_mid']);
             $item['quality_mid_name'] = $manageModel->getName($item['quality_mid']);
+        $planMap = Project::planMap();
+        $seoPlanMap = Project::seoMap();
+        $item['plan'] = $planMap[$item['plan']] ?? '';
+        $item['seo_plan'] = $seoPlanMap[$item['seo_plan']] ?? '';
+        $domainModel = new DomainInfoModel();
+        $item['domain'] = !empty($item['domain']) ?  $domainModel->getDomain($item['domain']) : '';
+        $item['uuid'] = TicketProject::where('table_id', $item['id'])->where('project_cate', 2)->value('uuid') ?? null;
+        $item['friend_id'] = ProjectAssociation::where('project_id', $item['id'])->where('status', ProjectAssociation::STATUS_NORMAL)->where('binding_app', ProjectAssociation::ENTERPRISE_WECHAT)->value('friend_id') ?? null;
+        $item['autologin_code'] = getAutoLoginCode($item['id']);
+        $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date']));
+        $item['product_num'] = $data['product'] ?? 0;
+        $item['keyword_num'] = $data['key'] ?? 0;
+        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
+        $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
+        $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
+        $item['collect_time'] = $item['is_upgrade'] ? UpdateLog::getProjectUpdate($item['id']) : '';
+        $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         return $item;
         return $item;
     }
     }
 
 

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingsLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:43
+ */
+
+namespace App\Http\Logic\Aside\Geo;
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Geo\GeoWritings;
+
+/**
+ * @remark :文章任务
+ * @name   :GeoWritingsLogic
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:44
+ */
+class GeoWritingsLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new GeoWritings();
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingsTaskLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:45
+ */
+
+namespace App\Http\Logic\Aside\Geo;
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Geo\GeoWritings;
+use App\Models\Geo\GeoWritingsTask;
+
+class GeoWritingsTaskLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new GeoWritingsTask();
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingsTask.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:47
+ */
+
+namespace App\Models\Geo;
+
+use App\Models\Base;
+
+/**
+ * @remark :文章生成任务
+ * @name   :GeoWritingsTask
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 10:48
+ */
+class GeoWritingsTask extends Base
+{
+    protected $table = 'gl_project_geo_writings_task';
+}