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

当月统计每天执行一次



查看合并请求 !647

-<?php
-
-namespace App\Console\Commands\MonthlyCount;
-
-use App\Helper\FormGlobalsoApi;
-use App\Models\Domain\DomainInfo;
-use App\Models\Inquiry\InquiryFormData;
-use App\Models\Project\Project;
-use App\Services\ProjectServer;
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-class InquiryMonthlyCount extends Command
-{
-    const STATUS_ERROR = 400;
-    public $error = 0;
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'month_count';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = '询盘月报告统计';
-
-    /**
-     * @remark :询盘月报告
-     * @name   :handle
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/30 9:32
-     */
-    public function handle(){
-        $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
-            ->where('gl_project.type','!=',0)
-            ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
-            ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
-            ->select($this->selectParam())->get()->toArray();
-        // 获取上个月的开始时间
-        $startTime = Carbon::now()->subMonth()->startOfMonth()->toDateString();
-        // 获取上个月的结束时间
-        $endTime = Carbon::now()->subMonth()->endOfMonth()->toDateString();
-        $domainInfo = new DomainInfo();
-        foreach ($list as  $value){
-            $value = (array)$value;
-            if($value['type'] == Project::TYPE_ZERO){
-                continue;
-            }
-            if(!empty($value['domain'])){
-                $info = $domainInfo->read(['id'=>$value['domain']]);
-                if($info !== false){
-                    $value['test_domain'] = $info['domain'];
-                }
-            }
-            $arr = [];
-            //按月统计询盘记录
-            $arr = $this->inquiryCount($arr,$startTime,$endTime,$value['test_domain'],$value['project_id']);
-            $arr = $this->flowCount($arr,$startTime,$endTime,$value['project_id']);
-            ProjectServer::useProject($value['project_id']);
-            $arr = $this->sourceCount($arr,$value['test_domain'],$startTime,$endTime);
-            DB::disconnect('custom_mysql');
-            $arr['created_at'] = date('Y-m-d H:i:s');
-            $arr['updated_at'] = date('Y-m-d H:i:s');
-            $arr['project_id'] = $value['project_id'];
-            // 获取当前日期时间
-            $arr['month'] = Carbon::now()->subMonth()->format('Y-m');
-            try {
-                DB::table('gl_month_count')->insert($arr);
-                Log::channel('month_count')->error('success:project_id .'.$arr['project_id']);
-            }catch (\Exception $e){
-                Log::channel('month_count')->error('month_count：error ' . $e->getMessage());
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @param $domain
-     * @param $project_id
-     * @remark :询盘按月统计
-     * @name   :inquiryCount
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/30 14:29
-     */
-    public function inquiryCount(&$arr,&$startTime,&$endTime,$domain,$project_id){
-        $inquiry_list = (new FormGlobalsoApi())->getInquiryList($domain,'',1,100000000);
-        //总数
-        $arr['total'] = $inquiry_list['data']['total'] ?? 0;
-        //数据详情
-        $data = $inquiry_list['data']['data'] ?? 0;
-        $arr['month_total'] = 0;
-        $countryArr = [];
-        $arr['country'] = "";
-        if(!empty($data)){
-            foreach ($data as $v){
-                if(($startTime.' 00:00:00' <= $v['submit_time']) && $v['submit_time'] <= $endTime.' 23:59:59'){
-                    $arr['month_total']++;
-                    if(isset($countryArr[$v['country']])){
-                        $countryArr[$v['country']]++;
-                    }else{
-                        $countryArr[$v['country']] = 1;
-                    }
-                }
-            }
-        }
-        //加上其他询盘
-        ProjectServer::useProject($project_id);
-        $arr['total'] += InquiryFormData::count();
-        $arr['month_total'] += InquiryFormData::getCount([$startTime, $endTime]);
-        $countryData = InquiryFormData::getCountryCount([$startTime, $endTime]);
-        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, 15, true);
-        $arr['country'] = json_encode($top20);
-        return $arr;
-    }
-
-    /**
-     * @remark :流量统计
-     * @name   :flowCount
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/30 14:31
-     */
-    public function flowCount(&$arr,&$startTime,&$endTime,$project_id){
-        $pv_ip = DB::table('gl_count')
-            ->where(['project_id'=>$project_id])
-            ->where('date','>=',$startTime.' 00:00:00')
-            ->where('date','<=',$endTime.' 23:59:59')
-            ->select(DB::raw('SUM(pv_num) as pv_num'), DB::raw('SUM(ip_num) as ip_num'))
-            ->first();
-        $arr['pv'] = $pv_ip->pv_num;
-        $arr['ip'] = $pv_ip->ip_num;
-        if($arr['ip'] != 0){
-            $arr['rate'] = round(($arr['month_total'] / $arr['ip']) * 10,2);
-        }
-        return $arr;
-    }
-
-    /**
-     * @remark :来源访问前8
-     * @name   :sourceCount
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/30 16:14
-     */
-    public function sourceCount(&$arr,$domain,$startTime,$endTime){
-        //访问来源前10
-        $source = DB::connection('custom_mysql')->table('gl_customer_visit')
-            ->select('referrer_url', DB::raw('COUNT(*) as count'))
-            ->groupBy('referrer_url')
-            ->whereBetween('updated_date', [$startTime,$endTime])
-            ->orderByDesc('count')->limit(10)->get()->toArray();
-        $arr['source'] = json_encode($source);
-        //访问国家前15
-        $source_country = DB::connection('custom_mysql')->table('gl_customer_visit')
-            ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
-            ->groupBy('country')
-            ->whereBetween('updated_date', [$startTime,$endTime])
-            ->orderBy('ip','desc')->limit(15)->get()->toArray();
-        $arr['source_country'] = json_encode($source_country);
-        //受访界面前15
-        $referrer_url = DB::connection('custom_mysql')->table('gl_customer_visit')
-            ->select('url',DB::raw('COUNT(*) as num'))
-            ->orderBy('num','desc')
-            ->whereBetween('updated_date', [$startTime,$endTime])
-            ->groupBy('url')
-            ->limit(15)->get()->toArray();
-        $arr['referrer_url'] = json_encode($referrer_url);
-        //访问端口
-        $referrer_port = DB::connection('custom_mysql')->table('gl_customer_visit')
-            ->select('device_port',DB::raw('COUNT(*) as num'))
-            ->orderBy('num','desc')
-            ->whereBetween('updated_date', [$startTime,$endTime])
-            ->groupBy('device_port')
-            ->limit(15)->get()->toArray();
-        $arr['referrer_port'] = json_encode($referrer_port);
-        return $arr;
-    }
-
-    /**
-     * @name   :(查询参数设置)selectParam
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/14 15:00
-     */
-    public function selectParam(){
-        $select = [
-            'gl_project.id AS id',
-            'gl_project.type AS type',
-            'gl_project.extend_type AS extend_type',
-            'gl_project_deploy_build.test_domain AS test_domain',
-            'gl_project_deploy_optimize.domain AS domain',
-            'gl_project_deploy_build.project_id AS project_id',
-            'gl_project.cooperate_date AS cooperate_date',
-            'gl_project_deploy_build.service_duration AS service_duration',
-        ];
-        return $select;
-    }
-}

+<?php
+/**
+ * @remark :
+ * @name   :UpgradeProjectCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/1/8 9:03
+ */
+
+namespace App\Console\Commands\MonthlyCount;
+
+use App\Models\Com\UpdateOldInfo;
+use App\Models\Domain\DomainInfo;
+use App\Models\Project\Project;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use App\Models\HomeCount\MonthCount AS MonthCountModel;
+
+class MonthCount extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'month_counts';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '每天生成月统计记录';
+
+    public function handle(){
+        $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
+            ->where('gl_project.type','!=',0)->where('gl_project.id',1)
+            ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
+            ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
+            ->select($this->selectParam())->get()->toArray();
+        foreach ($list as $v) {
+            $v = (array)$v;
+            if($v['type'] == Project::TYPE_ZERO){
+                continue;
+            }
+            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{
+                $domainInfo = new DomainInfo();
+                if(!empty($v['domain'])){
+                    $info = $domainInfo->read(['id'=>$v['domain']]);
+                    if($info !== false){
+                        $url = $info['domain'];
+                    }
+                }else{
+                    $url = $v['test_domain'];
+                }
+            }
+            ProjectServer::useProject($v['id']);
+            echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL;
+            $this->count($v['id'], $url);
+            DB::disconnect('custom_mysql');
+        }
+    }
+
+    /**
+     * @name   :(查询参数设置)selectParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:00
+     */
+    public function selectParam(){
+        $select = [
+            'gl_project.id AS id',
+            'gl_project.type AS type',
+            'gl_project.extend_type AS extend_type',
+            'gl_project_deploy_build.test_domain AS test_domain',
+            'gl_project.is_upgrade AS is_upgrade',
+            'gl_project_deploy_optimize.domain AS domain',
+            'gl_project_deploy_build.project_id AS project_id',
+            'gl_project.cooperate_date AS cooperate_date',
+            'gl_project_deploy_build.service_duration AS service_duration',
+        ];
+        return $select;
+    }
+    /**
+     * @remark :日统计记录
+     * @name   :count
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/8 9:05
+     */
+    public function count($project_id,$url){
+        $list = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select(DB::raw("DATE_FORMAT(updated_date, '%Y-%m') as month"))
+            ->groupBy('month')->get()->toArray();
+        foreach ($list as $k=>$v){
+            $v = (array)$v;
+            $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']);
+            }
+            $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;
+    }
+
+    /**
+     * @remark :本月询盘总量
+     * @name   :month_total
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/8 11:02
+     */
+    public function pv_ip(&$arr,$start,$end,$project_id){
+        $pv_ip = DB::table('gl_count')
+            ->where(['project_id'=>$project_id])
+            ->where('date','>=',$start.' 00:00:00')
+            ->where('date','<=',$end.' 23:59:59')
+            ->select(DB::raw('SUM(pv_num) as pv_num'), DB::raw('SUM(ip_num) as ip_num'),DB::raw('SUM(inquiry_num) as inquiry_num'))
+            ->first();
+        $arr['pv'] = $pv_ip->pv_num;
+        $arr['ip'] = $pv_ip->ip_num;
+        if($arr['ip'] != 0){
+            $arr['rate'] = round((($arr['month_total'] ?? 0) / $arr['ip']) * 10,2);
+        }
+        return $arr;
+    }
+    /**
+     * @remark :来源访问前8
+     * @name   :sourceCount
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/30 16:14
+     */
+    public function sourceCount(&$arr,$startTime,$endTime){
+        //访问来源前10
+        $source = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('referrer_url', DB::raw('COUNT(*) as count'))
+            ->groupBy('referrer_url')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->orderByDesc('count')->limit(10)->get()->toArray();
+        $arr['source'] = json_encode($source);
+        //访问国家前15
+        $source_country = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
+            ->groupBy('country')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->orderBy('ip','desc')->limit(15)->get()->toArray();
+        $arr['source_country'] = json_encode($source_country);
+        //受访界面前15
+        $referrer_url = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('url',DB::raw('COUNT(*) as num'))
+            ->orderBy('num','desc')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->groupBy('url')
+            ->limit(15)->get()->toArray();
+        $arr['referrer_url'] = json_encode($referrer_url);
+        //访问端口
+        $referrer_port = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('device_port',DB::raw('COUNT(*) as num'))
+            ->orderBy('num','desc')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->groupBy('device_port')
+            ->limit(15)->get()->toArray();
+        $arr['referrer_port'] = json_encode($referrer_port);
+        return $arr;
+    }
+
+    public function inquiry($url,$month){
+        $url = 'https://'.$url.'/';
+        $token = md5($url.date("Y-m-d"));
+        $url = 'https://form.globalso.com/api/external-interface/country_con/15243d63ed5a5738?domain='.$url.'&token='.$token.'&source=1,2,3,4&model=month&sta_date='.$month;
+        $res = http_get($url,['charset=utf-8']);
+        echo date('Y-m-d H:i:s') . '数据：'.json_encode($res) . PHP_EOL;
+        return $res;
+    }
+
+}

@@ -77,7 +77,7 @@ class SuppliersController extends BaseController
         if(isset($res['status_code']) && $res['status_code'] != 200){
         if(isset($res['status_code']) && $res['status_code'] != 200){
             $this->response($res['message'],Code::SYSTEM_ERROR);
             $this->response($res['message'],Code::SYSTEM_ERROR);
         }
         }
-        return $this->success($res['data']);
+        return $this->success($res['data'] ?? []);
     }
     }
     /**
     /**
      * @remark :按名字搜索公司
      * @remark :按名字搜索公司

@@ -30,7 +30,6 @@ class MonthCountLogic extends BaseLogic
      */
      */
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
-        $new = $this->currentMonthCount();
         $lists = $this->model->list($map,$order,$filed,'desc',10);
         $lists = $this->model->list($map,$order,$filed,'desc',10);
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
             foreach ($lists as $k => $v){
             foreach ($lists as $k => $v){
@@ -49,7 +48,6 @@ class MonthCountLogic extends BaseLogic
                 $lists[$k] = $v;
                 $lists[$k] = $v;
             }
             }
         }
         }
-        $lists['new'] = $new;
         return $this->success($lists);
         return $this->success($lists);
     }
     }
 
 
@@ -156,7 +154,7 @@ class MonthCountLogic extends BaseLogic
             ->where('referrer_url','!=','')
             ->where('referrer_url','!=','')
             ->whereBetween('updated_date', [$startTime,$endTime])
             ->whereBetween('updated_date', [$startTime,$endTime])
             ->orderByDesc('count')->limit(10)->get()->toArray();
             ->orderByDesc('count')->limit(10)->get()->toArray();
-        $arr['source'] = $source;
+        $arr['source'] = $source ?? [];
         //访问国家前15
         //访问国家前15
         $query = DB::connection('custom_mysql')->table('gl_customer_visit')
         $query = DB::connection('custom_mysql')->table('gl_customer_visit')
             ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
             ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
@@ -166,7 +164,7 @@ class MonthCountLogic extends BaseLogic
         }
         }
         $source_country = $query->whereBetween('updated_date', [$startTime,$endTime])
         $source_country = $query->whereBetween('updated_date', [$startTime,$endTime])
             ->orderBy('ip','desc')->limit(15)->get()->toArray();
             ->orderBy('ip','desc')->limit(15)->get()->toArray();
-        $arr['source_country'] = $source_country;
+        $arr['source_country'] = $source_country ?? [];
         //受访界面前15
         //受访界面前15
         $referrer_url = DB::connection('custom_mysql')->table('gl_customer_visit')
         $referrer_url = DB::connection('custom_mysql')->table('gl_customer_visit')
             ->select('url',DB::raw('COUNT(*) as num'))
             ->select('url',DB::raw('COUNT(*) as num'))
@@ -174,15 +172,15 @@ class MonthCountLogic extends BaseLogic
             ->whereBetween('updated_date', [$startTime,$endTime])
             ->whereBetween('updated_date', [$startTime,$endTime])
             ->groupBy('url')
             ->groupBy('url')
             ->limit(15)->get()->toArray();
             ->limit(15)->get()->toArray();
-        $arr['referrer_url'] = $referrer_url;
-        //访问断后
+        $arr['referrer_url'] = $referrer_url ?? [];
+        //访问端口
         $referrer_port = DB::connection('custom_mysql')->table('gl_customer_visit')
         $referrer_port = DB::connection('custom_mysql')->table('gl_customer_visit')
             ->select('device_port',DB::raw('COUNT(*) as num'))
             ->select('device_port',DB::raw('COUNT(*) as num'))
             ->orderBy('num','desc')
             ->orderBy('num','desc')
             ->whereBetween('updated_date', [$startTime,$endTime])
             ->whereBetween('updated_date', [$startTime,$endTime])
             ->groupBy('device_port')
             ->groupBy('device_port')
             ->limit(15)->get()->toArray();
             ->limit(15)->get()->toArray();
-        $arr['referrer_port'] = $referrer_port;
+        $arr['referrer_port'] = $referrer_port ?? [];
         return $arr;
         return $arr;
     }
     }
 
 

@@ -144,7 +144,7 @@ class KeywordLogic extends  BaseLogic
                     continue;
                     continue;
                 }
                 }
                 $this->model = new Keyword();
                 $this->model = new Keyword();
-                $info = $this->model->read(['title'=>$v]);
+                $info = $this->model->read(['title'=>$v],['id']);
                 if($info === false){
                 if($info === false){
                     $param['project_id'] = $this->user['project_id'];
                     $param['project_id'] = $this->user['project_id'];
                     $param['created_at'] = date('Y-m-d H:i:s');
                     $param['created_at'] = date('Y-m-d H:i:s');

@@ -44,7 +44,12 @@ class QueryListener
                         }
                         }
                     }
                     }
                 }
                 }
-                $log = vsprintf($sql, $event->bindings);
+                if(strpos($sql,'%Y-%m') === false){
+                    $log = vsprintf($sql, $event->bindings);
+                }else{
+                    $log = $sql;
+                }
+
                 $log = $log.'  [ RunTime:'.$event->time.'ms ] ';
                 $log = $log.'  [ RunTime:'.$event->time.'ms ] ';
                 Log::debug($log);
                 Log::debug($log);
             }
             }