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

gx创建作者



查看合并请求 !1198

@@ -16,6 +16,8 @@ use App\Models\Product\CategoryRelated;
 use App\Models\Product\Detail;
 use App\Models\Product\Detail;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Visit\Visit;
+use App\Models\Visit\VisitItem;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -39,8 +41,8 @@ class DownloadProject extends Command
     protected $description = '导出项目数据';
     protected $description = '导出项目数据';
 
 
     public function handle(){
     public function handle(){
-        ProjectServer::useProject(1225);
-        $data = $this->downloadProduct();
+        ProjectServer::useProject(1646);
+        $data = $this->downloadItem();
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         return $this->exportData($data);
         return $this->exportData($data);
@@ -111,22 +113,20 @@ class DownloadProject extends Command
         $spreadsheet = new Spreadsheet();
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
         $sheet = $spreadsheet->getActiveSheet();
         // 添加表头
         // 添加表头
-        $sheet->setCellValue('A1', '产品名称');
-        $sheet->setCellValue('B1', '产品短描述');
-        $sheet->setCellValue('C1', '产品内容');
-        $sheet->setCellValue('D1', '产品路由');
-        $sheet->setCellValue('E1', '产品分类');
-        $sheet->setCellValue('F1', '产品状态');
-        $sheet->setCellValue('G1', '产品主图');
+        $sheet->setCellValue('A1', '浏览时间');
+        $sheet->setCellValue('B1', '访客来源');
+        $sheet->setCellValue('C1', '访客入路页面');
+        $sheet->setCellValue('D1', '终端');
+        $sheet->setCellValue('E1', '国家ip');
+        $sheet->setCellValue('F1', '深度访问页数');
         $rowCount = 2;
         $rowCount = 2;
         foreach ($data as $v) {
         foreach ($data as $v) {
-            $sheet->setCellValue('A' . $rowCount, $v['title']);
-            $sheet->setCellValue('B' . $rowCount, $v['intro']);
-            $sheet->setCellValue('C' . $rowCount, $v['content']);
-            $sheet->setCellValue('D' . $rowCount, $v['url']);
-            $sheet->setCellValue('E' . $rowCount, $v['category_id_text']);
-            $sheet->setCellValue('F' . $rowCount, '发布中');
-            $sheet->setCellValue('G' . $rowCount, $v['images']);
+            $sheet->setCellValue('A' . $rowCount, $v['created_at']);
+            $sheet->setCellValue('B' . $rowCount, $v['referrer_url']);
+            $sheet->setCellValue('C' . $rowCount, $v['url']);
+            $sheet->setCellValue('D' . $rowCount, $v['device_text']);
+            $sheet->setCellValue('E' . $rowCount, $v['ip']);
+            $sheet->setCellValue('F' . $rowCount, $v['depth']);
             $rowCount++;
             $rowCount++;
         }
         }
         // 创建一个新的 Excel Writer 对象
         // 创建一个新的 Excel Writer 对象
@@ -140,4 +140,25 @@ class DownloadProject extends Command
         // 返回导出文件的响应
         // 返回导出文件的响应
         return ['file_link'=>url('upload/excel/'.$filename)];
         return ['file_link'=>url('upload/excel/'.$filename)];
     }
     }
+
+    public function downloadItem($filed = ['id','depth','created_at','referrer_url','url','device_port','country','ip']){
+        $visitModel = new Visit();
+        $lists = $visitModel->list(['updated_date'=>['between',['025-02-01','2025-02-31']]]);
+        foreach ($lists as $v){
+            $customer_visit_id[] = $v['id'];
+        }
+        $itemModel = new VisitItem();
+        $itemList = $itemModel->list(['customer_visit_id'=>['in',$customer_visit_id]],['customer_visit_id','url']);
+        foreach ($lists as $key => $value){
+            $sub = [];
+            foreach ($itemList as $sonValue){
+                if($value['id'] == $sonValue['customer_visit_id']){
+                    $sub[] = $sonValue;
+                }
+            }
+            $value['sub'] = $sub;
+            $lists[$key] = $value;
+        }
+        return $this->success($lists);
+    }
 }
 }