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

gx创建作者



查看合并请求 !1200

@@ -41,8 +41,8 @@ class DownloadProject extends Command
     protected $description = '导出项目数据';
     protected $description = '导出项目数据';
 
 
     public function handle(){
     public function handle(){
-        ProjectServer::useProject(1646);
-        $data = $this->downloadItem();
+        ProjectServer::useProject(1225);
+        $data = $this->downloadProduct();
         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);
@@ -52,7 +52,7 @@ class DownloadProject extends Command
     {
     {
         $product = new Product();
         $product = new Product();
         $filed = ['id', 'project_id', 'title' ,'thumb' , 'route' ,'intro','content',
         $filed = ['id', 'project_id', 'title' ,'thumb' , 'route' ,'intro','content',
-            'category_id', 'status'];
+            'category_id', 'status','seo_mate'];
         $this->order = 'sort';
         $this->order = 'sort';
         $lists = $product->list(['status'=>1],'id',$filed);
         $lists = $product->list(['status'=>1],'id',$filed);
         if(!empty($lists)){
         if(!empty($lists)){
@@ -108,25 +108,62 @@ class DownloadProject extends Command
         }
         }
         return $data;
         return $data;
     }
     }
+//    public function exportData($data){
+//        // 创建一个新的 Excel 电子表格实例
+//        $spreadsheet = new Spreadsheet();
+//        $sheet = $spreadsheet->getActiveSheet();
+//        // 添加表头
+//        $sheet->setCellValue('A1', '浏览时间');
+//        $sheet->setCellValue('B1', '访客来源');
+//        $sheet->setCellValue('C1', '访客入路页面');
+//        $sheet->setCellValue('D1', '终端');
+//        $sheet->setCellValue('E1', '国家ip');
+//        $sheet->setCellValue('F1', '深度访问页数');
+//        $rowCount = 2;
+//        foreach ($data as $v) {
+//            $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++;
+//        }
+//        // 创建一个新的 Excel Writer 对象
+//        $writer = new Xlsx($spreadsheet);
+//        $filename = time().'.xlsx';
+//        // 设置导出文件的保存路径和文件名
+//        $filePath = public_path('upload/excel/'.$filename);
+//        // 导出 Excel 文件
+//        $writer->save($filePath);
+//        echo date('Y-m-d H:i:s') . 'file_link:'.url('upload/excel/'.$filename) . PHP_EOL;
+//        // 返回导出文件的响应
+//        return ['file_link'=>url('upload/excel/'.$filename)];
+//    }
+
     public function exportData($data){
     public function exportData($data){
         // 创建一个新的 Excel 电子表格实例
         // 创建一个新的 Excel 电子表格实例
         $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', '国家ip');
-        $sheet->setCellValue('F1', '深度访问页数');
+        $sheet->setCellValue('A1', '产品名称');
+        $sheet->setCellValue('B1', '产品短描述');
+        $sheet->setCellValue('C1', '产品内容');
+        $sheet->setCellValue('D1', '产品路由');
+        $sheet->setCellValue('E1', '产品分类');
+        $sheet->setCellValue('F1', '产品状态');
+        $sheet->setCellValue('G1', '产品主图');
+        $sheet->setCellValue('H1', '产品TDK');
         $rowCount = 2;
         $rowCount = 2;
         foreach ($data as $v) {
         foreach ($data as $v) {
-            $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']);
+            $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('H' . $rowCount, $v['seo_mate']);
             $rowCount++;
             $rowCount++;
         }
         }
         // 创建一个新的 Excel Writer 对象
         // 创建一个新的 Excel Writer 对象
@@ -141,26 +178,26 @@ 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();
-        $page = 1;
-        $pageSize = 3000;
-        $lists = $visitModel->lists(['updated_date'=>['between',['2025-02-01','2025-02-31']]],$page,$pageSize,'id',$filed);
-        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 $lists;
-    }
+//    public function downloadItem($filed = ['id','depth','created_at','referrer_url','url','device_port','country','ip']){
+//        $visitModel = new Visit();
+//        $page = 1;
+//        $pageSize = 3000;
+//        $lists = $visitModel->lists(['updated_date'=>['between',['2025-02-01','2025-02-31']]],$page,$pageSize,'id',$filed);
+//        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 $lists;
+//    }
 }
 }