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

刘锟
app/Console/Commands/DayCount/Count.php
app/Console/Commands/DayCount/UpgradeCount.php → app/Console/Commands/DayCount/CountAll.php
app/Console/Commands/DayCount/UpgradeProjectCount.php → app/Console/Commands/DayCount/CountProject.php
app/Console/Commands/MonthlyCount/UpgradeCount.php → app/Console/Commands/MonthlyCount/MonthAllCount.php
app/Console/Commands/MonthlyCount/MonthCount.php
app/Console/Commands/MonthlyCount/UpgradeProjectCount.php → app/Console/Commands/MonthlyCount/MonthProjectCount.php
app/Console/Commands/Sync/SyncSubmitTask.php
app/Console/Commands/Sync/SyncSubmitTaskDistribution.php
app/Console/Commands/Test/UpdateRoute.php
app/Http/Controllers/Bside/Product/KeywordController.php
app/Models/Product/KeywordPage.php
app/Services/SyncSubmitTaskService.php
routes/bside.php
--- a/app/Console/Commands/DayCount/Count.php
查看文件 @1f3efa5
+++ b/app/Console/Commands/DayCount/Count.php
查看文件 @1f3efa5
@@ -5,6 +5,7 @@ namespace App\Console\Commands\DayCount;
 use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Domain\DomainInfo;
+use App\Models\Inquiry\InquiryForm;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
--- a/app/Console/Commands/DayCount/UpgradeCount.php → app/Console/Commands/DayCount/CountAll.php
查看文件 @1f3efa5
+++ b/app/Console/Commands/DayCount/UpgradeCount.php → app/Console/Commands/DayCount/CountAll.php
查看文件 @1f3efa5
 <?php
 /**
  * @remark :
- * @name   :UpgradeProjectCount.php
+ * @name   :CountProject.php
  * @author :lyh
  * @method :post
  * @time   :2024/1/8 9:03
@@ -9,6 +9,8 @@
 namespace App\Console\Commands\DayCount;
+use App\Helper\FormGlobalsoApi;
+use App\Models\Inquiry\InquiryFormData;
 use App\Models\Project\Project;
 use App\Models\Visit\Visit;
 use App\Services\ProjectServer;
@@ -16,14 +18,15 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use App\Models\HomeCount\Count;
-class UpgradeCount extends Command
+class CountAll extends Command
 {
+
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'upgrade_counts';
+    protected $signature = 'count_all';
     /**
      * The console command description.
@@ -34,7 +37,7 @@ class UpgradeCount extends Command
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0]);
+        $list = $projectModel->list(['delete_status'=>0]);
         foreach ($list as $v) {
             echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -90,6 +93,52 @@ class UpgradeCount extends Command
     }
     /**
+     * @param $arr
+     * @param $domain
+     * @name   :(询盘统计)inquiry
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:44
+     */
+    public function inquiry($arr,$domain,$project_id){
+        $inquiry_list = (new FormGlobalsoApi())->getInquiryList($domain,'',1,100000000);
+        if($inquiry_list == false){
+            return false;
+        }
+        if($inquiry_list['status'] == self::STATUS_ERROR){
+            $arr['inquiry_num'] = 0;
+            $countryArr = [];
+        }else{
+            $arr['inquiry_num'] = $inquiry_list['data']['total'];
+            //询盘国家统计
+            $countryData = $inquiry_list['data']['data'];
+            $countryArr = [];
+            foreach ($countryData as $v1){
+                if(isset($countryArr[$v1['country']])){
+                    $countryArr[$v1['country']]++;
+                }else{
+                    $countryArr[$v1['country']] = 1;
+                }
+            }
+        }
+        //加上其他询盘
+        ProjectServer::useProject($project_id);
+        $arr['inquiry_num'] += InquiryFormData::getCount();
+        $countryData = InquiryFormData::getCountryCount();
+        foreach ($countryData as $v1){
+            if(isset($countryArr[$v1['country']])){
+                $countryArr[$v1['country']] += $v1['count'];
+            }else{
+                $countryArr[$v1['country']] = $v1['count'];
+            }
+        }
+        arsort($countryArr);
+        $top20 = array_slice($countryArr, 0, 20, true);
+        $arr['country'] = json_encode($top20);
+        return $arr;
+    }
+
+    /**
      * @remark :询盘数量
      * @name   :inquiry_num
      * @author :lyh
--- a/app/Console/Commands/DayCount/UpgradeProjectCount.php → app/Console/Commands/DayCount/CountProject.php
查看文件 @1f3efa5
+++ b/app/Console/Commands/DayCount/UpgradeProjectCount.php → app/Console/Commands/DayCount/CountProject.php
查看文件 @1f3efa5
 <?php
 /**
  * @remark :
- * @name   :UpgradeProjectCount.php
+ * @name   :CountProject.php
  * @author :lyh
  * @method :post
  * @time   :2024/1/8 9:03
@@ -9,6 +9,10 @@
 namespace App\Console\Commands\DayCount;
+use App\Helper\FormGlobalsoApi;
+use App\Models\Domain\DomainInfo;
+use App\Models\Inquiry\InquiryFormData;
+use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Visit\Visit;
 use App\Services\ProjectServer;
@@ -16,14 +20,16 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use App\Models\HomeCount\Count;
-class UpgradeProjectCount extends Command
+class CountProject extends Command
 {
+    const STATUS_ERROR = 400;
+    public $error = 0;
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'upgrade_count {project_id}';
+    protected $signature = 'count_project {project_id}';
     /**
      * The console command description.
@@ -51,6 +57,19 @@ class UpgradeProjectCount extends Command
             ->groupBy('updated_date')->get()->toArray();
         $project = new Project();
         $projectInfo = $project->read(['id'=>$project_id]);
+        $projectOptimizeModel = new DeployOptimize();
+        $optimizeInfo =  $projectOptimizeModel->read(['project_id'=>$project_id]);
+        $domain = '';
+        if(!empty($optimizeInfo['domain'])){
+            $domainInfoModel = new DomainInfo();
+            $domainInfo = $domainInfoModel->read(['id'=>$optimizeInfo['domain']]);
+            if($domainInfo !== false){
+                $domain = $domainInfo['domain'];
+            }
+        }
+        if(empty($domain)){
+            return false;
+        }
         if(!empty($list)){
             $arr = [];
             foreach ($list as $k=>$v){
@@ -64,12 +83,11 @@ class UpgradeProjectCount extends Command
                 $arr['date'] = $v['updated_date'];
                 $arr['pv_num'] = $this->pv_num($v['updated_date']);
                 $arr['ip_num'] = $this->ip_num($v['updated_date']);
-                $arr['inquiry_num'] = $this->inquiry_num($v['updated_date']);
                 //服务达标天数
                 $arr['compliance_day'] = $projectInfo['finish_remain_day'];
                 //剩余服务时常
                 $arr['service_day'] = $projectInfo['remain_day'];
-                $arr['country'] = json_encode([]);
+                $arr = $this->inquiry($arr,$domain, $project_id);
                 //查询当天数据是否存在  存在则更新
                 $info = $count->read(['date'=>$v['updated_date'],'project_id'=>$project_id]);
                 if($info === false){
@@ -103,7 +121,6 @@ class UpgradeProjectCount extends Command
      * @time   :2023/6/14 15:40
      */
     public function pv_num($day){
-        //$pv = DB::connection('custom_mysql')->table('gl_customer_visit_item')->whereDate('updated_date', $day)->count();
 		$pv = DB::connection('custom_mysql')->table('gl_customer_visit')->whereDate('updated_date', $day)->sum('depth');
         return $pv;
     }
@@ -119,6 +136,50 @@ class UpgradeProjectCount extends Command
         return $ip;
     }
-
+    /**
+     * @param $arr
+     * @param $domain
+     * @name   :(询盘统计)inquiry
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:44
+     */
+    public function inquiry($arr,$domain,$project_id){
+        $inquiry_list = (new FormGlobalsoApi())->getInquiryList($domain,'',1,100000000);
+        if($inquiry_list == false){
+            return false;
+        }
+        if($inquiry_list['status'] == self::STATUS_ERROR){
+            $arr['inquiry_num'] = 0;
+            $countryArr = [];
+        }else{
+            $arr['inquiry_num'] = $inquiry_list['data']['total'];
+            //询盘国家统计
+            $countryData = $inquiry_list['data']['data'];
+            $countryArr = [];
+            foreach ($countryData as $v1){
+                if(isset($countryArr[$v1['country']])){
+                    $countryArr[$v1['country']]++;
+                }else{
+                    $countryArr[$v1['country']] = 1;
+                }
+            }
+        }
+        //加上其他询盘
+        ProjectServer::useProject($project_id);
+        $arr['inquiry_num'] += InquiryFormData::getCount();
+        $countryData = InquiryFormData::getCountryCount();
+        foreach ($countryData as $v1){
+            if(isset($countryArr[$v1['country']])){
+                $countryArr[$v1['country']] += $v1['count'];
+            }else{
+                $countryArr[$v1['country']] = $v1['count'];
+            }
+        }
+        arsort($countryArr);
+        $top20 = array_slice($countryArr, 0, 20, true);
+        $arr['country'] = json_encode($top20);
+        return $arr;
+    }
 }
--- a/app/Console/Commands/MonthlyCount/UpgradeCount.php → app/Console/Commands/MonthlyCount/MonthAllCount.php
查看文件 @1f3efa5
+++ b/app/Console/Commands/MonthlyCount/UpgradeCount.php → app/Console/Commands/MonthlyCount/MonthAllCount.php
查看文件 @1f3efa5
 <?php
 /**
  * @remark :
- * @name   :UpgradeProjectCount.php
+ * @name   :CountProject.php
  * @author :lyh
  * @method :post
  * @time   :2024/1/8 9:03
@@ -13,6 +13,7 @@ use App\Helper\FormGlobalsoApi;
 use App\Models\Com\UpdateOldInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\HomeCount\MonthCount;
+use App\Models\Inquiry\InquiryFormData;
 use App\Models\Project\Project;
 use App\Models\Visit\Visit;
 use App\Services\ProjectServer;
@@ -20,14 +21,14 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use App\Models\HomeCount\Count;
-class UpgradeCount extends Command
+class MonthAllCount extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'upgrade_month_counts';
+    protected $signature = 'month_all';
     /**
      * The console command description.
@@ -38,14 +39,23 @@ class UpgradeCount extends Command
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0]);
+        $list = $projectModel->list(['delete_status'=>0]);
         foreach ($list as $v) {
-            $oldModel = new UpdateOldInfo();
-            $info = $oldModel->read(['project_id' => $v['id']]);
-            if ($info !== false) {
-                $url = $info['old_domain_online'];
+            if($v['is_upgrade'] == 1){
+                $oldModel = new UpdateOldInfo();
+                $info = $oldModel->read(['project_id' => $v['id']]);
+                if ($info !== false) {
+                    $url = $info['old_domain_online'];
+                }else{
+                    continue;
+                }
             }else{
-                continue;
+                $domainModel = new DomainInfo();
+                $info = $domainModel->read(['project_id'=>$v['id']]);
+                if($info === false){
+                    continue;
+                }
+                $url = $info['domain'];
             }
             ProjectServer::useProject($v['id']);
             echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL;
@@ -78,7 +88,7 @@ class UpgradeCount extends Command
             $end = date('Y-m-t', strtotime($v['month']));
             $arr['project_id'] = $project_id;
             $res = $this->inquiry($url,$v['month']);
-//            $arr['month_total'] = 0;
+            $arr['total'] = 0;
             if(isset($res['data']['count'])){
                 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
                 $arr['month_total'] = $res['data']['count'];
@@ -91,9 +101,21 @@ class UpgradeCount extends Command
                     $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
                 }
             }
+            //获取当月的其他询盘
+            $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
+            $country = [];
             if(isset($res['data']['data'])){
-                $arr['country'] = json_encode($res['data']['data']);
+                $country = $res['data']['data'];
+            }
+            $countryData = InquiryFormData::getCountryCount([$start.' 00:00:00',$end.' 00:00:00']);
+            foreach ($countryData as $v1){
+                if(isset($country[$v1['country']])){
+                    $country[$v1['country']] += $v1['count'];
+                }else{
+                    $country[$v1['country']] = $v1['count'];
+                }
             }
+            $arr['country'] = json_encode($country);
             $arr['month'] = $v['month'];
             $arr = $this->pv_ip($arr,$start,$end,$project_id);
             $arr = $this->sourceCount($arr,$start,$end);
--- a/app/Console/Commands/MonthlyCount/MonthCount.php
查看文件 @1f3efa5
+++ b/app/Console/Commands/MonthlyCount/MonthCount.php
查看文件 @1f3efa5
 <?php
 /**
  * @remark :
- * @name   :UpgradeProjectCount.php
+ * @name   :CountProject.php
  * @author :lyh
  * @method :post
  * @time   :2024/1/8 9:03
@@ -11,6 +11,7 @@ namespace App\Console\Commands\MonthlyCount;
 use App\Models\Com\UpdateOldInfo;
 use App\Models\Domain\DomainInfo;
+use App\Models\Inquiry\InquiryFormData;
 use App\Models\Project\Project;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
@@ -98,44 +99,56 @@ class MonthCount extends Command
      * @time   :2024/1/8 9:05
      */
     public function count($project_id,$url){
-            $v = ['month'=>date('Y-m')];
-            $monthCountModel = new MonthCountModel();
-            $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
-            // 获取当月开始时间
-            $start = date('Y-m-01', strtotime($v['month']));
-            // 获取当月结束时间
-            $end = date('Y-m-t', strtotime($v['month']));
-            $arr['project_id'] = $project_id;
-            $res = $this->inquiry($url,$v['month']);
+        $v = ['month'=>date('Y-m')];
+        $monthCountModel = new MonthCountModel();
+        $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
+        // 获取当月开始时间
+        $start = date('Y-m-01', strtotime($v['month']));
+        // 获取当月结束时间
+        $end = date('Y-m-t', strtotime($v['month']));
+        $arr['project_id'] = $project_id;
+        $res = $this->inquiry($url,$v['month']);
 //            $arr['month_total'] = 0;
-            if(isset($res['data']['count'])){
-                echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
-                $arr['month_total'] = $res['data']['count'];
-                //获取上一个的count
-                $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
-                $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
-                if($previousInfo === false){
-                    $arr['total'] = $arr['month_total'];
-                }else{
-                    $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
-                }
-            }
-            if(isset($res['data']['data'])){
-                $arr['country'] = json_encode($res['data']['data']);
+        if(isset($res['data']['count'])){
+            echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
+            $arr['month_total'] = $res['data']['count'];
+            //获取上一个的count
+            $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
+            $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
+            if($previousInfo === false){
+                $arr['total'] = $arr['month_total'];
+            }else{
+                $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
             }
-            $arr['month'] = $v['month'];
-            $arr = $this->pv_ip($arr,$start,$end,$project_id);
-            $arr = $this->sourceCount($arr,$start,$end);
-            if($info === false){
-                $selectedDate = $start;
-                $firstDayOfNextMonth = date('Y-m-01 01:00:00', strtotime("$selectedDate +1 month"));
-                $arr['created_at'] = $firstDayOfNextMonth;
-                $arr['updated_at'] = $firstDayOfNextMonth;
-//                echo date('Y-m-d H:i:s') . '数据：'.json_encode($arr) . PHP_EOL;
-                $monthCountModel->insert($arr);
+        }
+        //获取当月的其他询盘
+        $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
+        $country = [];
+        if(isset($res['data']['data'])){
+            $country = $res['data']['data'];
+        }
+        $countryData = InquiryFormData::getCountryCount([$start.' 00:00:00',$end.' 00:00:00']);
+        foreach ($countryData as $v1){
+            if(isset($country[$v1['country']])){
+                $country[$v1['country']] += $v1['count'];
             }else{
-                $monthCountModel->edit($arr,['id'=>$info['id']]);
+                $country[$v1['country']] = $v1['count'];
             }
+        }
+        $arr['country'] = json_encode($country);
+        $arr['month'] = $v['month'];
+        $arr = $this->pv_ip($arr,$start,$end,$project_id);
+        $arr = $this->sourceCount($arr,$start,$end);
+        if($info === false){
+            $selectedDate = $start;
+            $firstDayOfNextMonth = date('Y-m-01 01:00:00', strtotime("$selectedDate +1 month"));
+            $arr['created_at'] = $firstDayOfNextMonth;
+            $arr['updated_at'] = $firstDayOfNextMonth;
+//                echo date('Y-m-d H:i:s') . '数据：'.json_encode($arr) . PHP_EOL;
+            $monthCountModel->insert($arr);
+        }else{
+            $monthCountModel->edit($arr,['id'=>$info['id']]);
+        }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
--- a/app/Console/Commands/MonthlyCount/UpgradeProjectCount.php → app/Console/Commands/MonthlyCount/MonthProjectCount.php
查看文件 @1f3efa5
+++ b/app/Console/Commands/MonthlyCount/UpgradeProjectCount.php → app/Console/Commands/MonthlyCount/MonthProjectCount.php
查看文件 @1f3efa5
 <?php
 /**
  * @remark :
- * @name   :UpgradeProjectCount.php
+ * @name   :CountProject.php
  * @author :lyh
  * @method :post
  * @time   :2024/1/8 9:03
@@ -13,6 +13,7 @@ use App\Helper\FormGlobalsoApi;
 use App\Models\Com\UpdateOldInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\HomeCount\MonthCount;
+use App\Models\Inquiry\InquiryFormData;
 use App\Models\Project\Project;
 use App\Models\Visit\Visit;
 use App\Services\ProjectServer;
@@ -20,14 +21,14 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use App\Models\HomeCount\Count;
-class UpgradeProjectCount extends Command
+class MonthProjectCount extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'upgrade_month_count {project_id}';
+    protected $signature = 'month_project {project_id}';
     /**
      * The console command description.
@@ -89,9 +90,21 @@ class UpgradeProjectCount extends Command
                     $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
                 }
             }
+            //获取当月的其他询盘
+            $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
+            $country = [];
             if(isset($res['data']['data'])){
-                $arr['country'] = json_encode($res['data']['data']);
+                $country = $res['data']['data'];
             }
+            $countryData = InquiryFormData::getCountryCount([$start.' 00:00:00',$end.' 00:00:00']);
+            foreach ($countryData as $v1){
+                if(isset($country[$v1['country']])){
+                    $country[$v1['country']] += $v1['count'];
+                }else{
+                    $country[$v1['country']] = $v1['count'];
+                }
+            }
+            $arr['country'] = json_encode($country);
             $arr['month'] = $v['month'];
             $arr = $this->pv_ip($arr,$start,$end,$project_id);
             $arr = $this->sourceCount($arr,$start,$end);
--- a/app/Console/Commands/Sync/SyncSubmitTask.php
查看文件 @1f3efa5
+++ b/app/Console/Commands/Sync/SyncSubmitTask.php
查看文件 @1f3efa5
@@ -28,23 +28,15 @@ class SyncSubmitTask extends Command
     public function handle()
     {
-        $backup = false;
         while (true) {
-            $task_id = $this->getTaskId();
-            if ($task_id > 2000000) {
-                $backup = true;
-            }
-            if (empty($task_id)) {
-                if ($backup) {
-                    $this->backup();
-                    $backup = false;
-                }
-                sleep(5);
+            $task_id = Redis::rpop('sync_submit_task');
+            if(!$task_id){
+                sleep(3);
                 continue;
             }
             $this->output('任务' . $task_id . '开始');
             $task_info = SyncSubmitTaskModel::find($task_id);
-            if (empty($task_info) || $task_info->status) {
+            if (empty($task_info) || $task_info->status !=3) {
                 $this->output('任务不存在或者已执行');
                 continue;
             }
@@ -79,29 +71,6 @@ class SyncSubmitTask extends Command
         }
     }
-    public function getTaskId()
-    {
-        $task_id = Redis::rpop('sync_submit_task');
-        $lockKey = 'lock_sync_submit_task';
-        if (empty($task_id)) {
-            // 获取锁
-            if (Redis::setnx($lockKey, 1)) {
-                // 设置锁的过期时间，防止死锁
-                Redis::expire($lockKey, 10);
-                $ids = SyncSubmitTaskModel::where('status', 0)->limit(100)->pluck('id');
-                foreach ($ids as $id) {
-                    Redis::lpush('sync_submit_task', $id);
-                }
-                $task_id = Redis::rpop('sync_submit_task');
-                Redis::del($lockKey);
-            } else {
-                // 未获取到锁
-                return '';
-            }
-        }
-        return $task_id;
-    }
-
     /**
      * 输出处理日志
      */
@@ -110,31 +79,4 @@ class SyncSubmitTask extends Command
         echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
         return true;
     }
-
-    /**
-     * 备份数据
-     * @author zbj
-     * @date 2024/1/23
-     */
-    public function backup()
-    {
-        DB::beginTransaction();
-        try {
-            $table = (new SyncSubmitTaskModel())->getTable();
-            $new_table = $table . '_backup_' . date('Ymd');
-
-            //重命名当前表
-            Schema::rename($table, $new_table);
-            //克隆表数据
-            DB::statement('CREATE TABLE ' . $table . ' LIKE ' . $new_table);
-
-            DB::commit();
-
-            $this->output('数据备份成功');
-        } catch (\Exception $e) {
-            $this->output('数据备份失败' . $e->getMessage());
-            DB::rollBack();
-        }
-        return true;
-    }
 }
--- a/app/Console/Commands/Sync/SyncSubmitTaskDistribution.php 0 → 100644
查看文件 @1f3efa5
+++ b/app/Console/Commands/Sync/SyncSubmitTaskDistribution.php 0 → 100644
查看文件 @1f3efa5
+<?php
+
+namespace App\Console\Commands\Sync;
+
+
+use App\Exceptions\InquiryFilterException;
+use App\Models\Project\Project;
+use App\Models\SyncSubmitTask\SyncSubmitTask as SyncSubmitTaskModel;
+use App\Services\SyncSubmitTaskService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+/**
+ *
+ * Class SyncSubmitTask
+ * @package App\Console\Commands
+ * @author zbj
+ * @date 2023/11/28
+ */
+class SyncSubmitTaskDistribution extends Command
+{
+
+    protected $signature = 'sync_submit_task_distribution';
+    protected $description = '询盘、访问异步任务分发';
+
+    public function handle()
+    {
+        while (true) {
+            $len = Redis::llen('sync_submit_task');
+            if (!$len) {
+                $max_id = SyncSubmitTaskModel::orderBy('id', 'desc')->value('id');
+                if ($max_id > 2000000) {
+                    $this->backup();
+                } else {
+                    $tasks = SyncSubmitTaskModel::where('status', 0)->limit(100)->get();
+                    foreach ($tasks as $task) {
+                        $task->status = 3;
+                        $task->save();
+                        Redis::lpush('sync_submit_task', $task->id);
+                    }
+                }
+            }
+            sleep(3);
+        }
+    }
+
+    /**
+     * 输出处理日志
+     */
+    public function output($message): bool
+    {
+        echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
+        return true;
+    }
+
+    /**
+     * 备份数据
+     * @author zbj
+     * @date 2024/1/23
+     */
+    public function backup()
+    {
+        DB::beginTransaction();
+        try {
+            $table = (new SyncSubmitTaskModel())->getTable();
+            $new_table = $table . '_backup_' . date('Ymd');
+
+            //重命名当前表
+            Schema::rename($table, $new_table);
+            //克隆表数据
+            DB::statement('CREATE TABLE ' . $table . ' LIKE ' . $new_table);
+
+            //未入队的写到新表
+            $list = DB::table($new_table)->where('status', 0)->get();
+            $data = [];
+            foreach ($list as $task) {
+                $data[] = [
+                    'type' => $task->type,
+                    'data' => json_encode($task->data),
+                    'created_at' => $task['created_at'],
+                    'updated_at' => $task['updated_at'],
+                ];
+            }
+            $data && SyncSubmitTaskModel::insert($data);
+
+            DB::commit();
+
+            $this->output('数据备份成功');
+        } catch (\Exception $e) {
+            $this->output('数据备份失败' . $e->getMessage());
+            DB::rollBack();
+        }
+        return $new_table ?? '';
+    }
+}
--- a/app/Console/Commands/Test/UpdateRoute.php
查看文件 @1f3efa5
+++ b/app/Console/Commands/Test/UpdateRoute.php
查看文件 @1f3efa5
@@ -54,12 +54,13 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1085]]]);
+        $list = $projectModel->list(['id'=>['in',[664]]]);
         $data = [];
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             $this->getProduct();
+//            $this->setProductKeyword();
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -106,19 +107,8 @@ class UpdateRoute extends Command
         if(!empty($lists)){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
-//                    $tag = "-tag";
-//                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
-//                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
-//                        $route = Translate::tran($v['route'], 'en').$tag;
-//                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-//                        $route = trim($v['route'],'-tag');
-//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-//                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-//                    }else{
-//                        $route = Translate::tran($v['title'], 'en').$tag;
-//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-//                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-//                    }
+                    echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
+                    continue;
                 }else{
                     echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
                     $route = Translate::tran($v['title'], 'en');
@@ -128,7 +118,6 @@ class UpdateRoute extends Command
                         $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                     }
                 }
-                echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
             }
         }
     }
@@ -224,7 +213,7 @@ class UpdateRoute extends Command
     public function getProduct(){
         $productModel = new Product();
-        $lists = $productModel->list(['status'=>1]);
+        $lists = $productModel->list(['status'=>1,'id'=>['<=',501]]);
         if(!empty($lists)){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
@@ -240,9 +229,10 @@ class UpdateRoute extends Command
 //                        $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
 //                        $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                     }
+                    continue;
                 }else{
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
-//                    $v['title'] = Translate::tran($v['title'], 'en');
+                    $v['title'] = Translate::tran($v['title'], 'en');
                     $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
                     $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                 }
--- a/app/Http/Controllers/Bside/Product/KeywordController.php
查看文件 @1f3efa5
+++ b/app/Http/Controllers/Bside/Product/KeywordController.php
查看文件 @1f3efa5
@@ -9,6 +9,7 @@ use App\Http\Logic\Bside\Product\KeywordLogic;
 use App\Http\Requests\Bside\Product\KeywordRequest;
 use App\Models\Com\NoticeLog;
 use App\Models\Product\Keyword;
+use App\Models\Product\KeywordPage;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\RouteMap\RouteMap;
@@ -242,6 +243,20 @@ class KeywordController extends BaseController
      * @time   :2024/7/2 10:14
      */
     public function batchUpdateKeyword(){
-        $noticeLogModel = new NoticeLog();
+        $this->request->validate([
+            'text'=>'required|array',
+            'update_object'=>'required|array',
+            'update_method'=>'required'
+        ],[
+            'text.required' => '文件内容不能为空',
+            'update_object.required' => '更新对象不为空',
+            'update_object.array' => '更新对象为数组',
+            'update_method.required' => '请求方式不为空'
+        ]);
+        $keywordPageModel = new KeywordPage();
+        $this->param['text'] = json_encode($this->param['text']);
+        $this->param['update_object'] = json_encode($this->param['update_object']);
+        $id = $keywordPageModel->addReturnId($this->param);
+        $this->response('success',Code::SUCCESS,['id'=>$id]);
     }
 }
--- a/app/Models/Product/KeywordPage.php 0 → 100644
查看文件 @1f3efa5
+++ b/app/Models/Product/KeywordPage.php 0 → 100644
查看文件 @1f3efa5
+<?php
+/**
+ * @remark :
+ * @name   :KeywordPage.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/7/2 15:26
+ */
+
+namespace App\Models\Product;
+
+use App\Models\Base;
+
+class KeywordPage extends Base
+{
+    protected $table = 'gl_product_keyword_page';
+    //连接数据库
+    protected $connection = 'custom_mysql';
+}
--- a/app/Services/SyncSubmitTaskService.php
查看文件 @1f3efa5
+++ b/app/Services/SyncSubmitTaskService.php
查看文件 @1f3efa5
@@ -133,6 +133,9 @@ class SyncSubmitTaskService
         $visit_data['updated_date'] = $data['submit_at']->toDateString();
         $visit_data['created_at'] = $data['submit_at'];
         $visit_data['user_agent'] = $data['user_agent'];
+        if(!empty($data['is_cf'])){
+            $visit_data['is_inquiry'] = 1;
+        }
         Visit::saveData($visit_data, $date);
         return true;
--- a/routes/bside.php
查看文件 @1f3efa5
+++ b/routes/bside.php
查看文件 @1f3efa5
@@ -271,6 +271,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::post('keyword/batchAdd', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'batchAdd'])->name('product_keyword_batchAdd');
         Route::post('keyword/batchDel', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'batchDel'])->name('product_keyword_batchDel');
         Route::any('keyword/delete', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'delete'])->name('product_keyword_delete');
+        Route::any('keyword/batchUpdateKeyword', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'batchUpdateKeyword'])->name('product_keyword_batchUpdateKeyword');
         Route::any('keyword/batchKeywordIsVideo', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'batchKeywordIsVideo'])->name('product_keyword_batchKeywordIsVideo');
         Route::any('keyword/batchKeywordFiled', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'batchKeywordFiled'])->name('product_keyword_batchKeywordFiled');
         //产品参数