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

gx



查看合并请求 !1752

@@ -16,6 +16,7 @@ use App\Models\Product\CategoryRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Visit\VisitItem;
 use App\Models\Workchat\MessagePush;
 use App\Models\Workchat\MessagePush;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -40,96 +41,112 @@ class DownloadProject extends Command
     protected $description = '导出项目数据';
     protected $description = '导出项目数据';
 
 
     public function handle(){
     public function handle(){
-        $v6WeekModel = new V6WeeklyReport();
-        $lists = $v6WeekModel->list([],'id',['*'],'desc',100);
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
-        foreach ($lists as $data){
-            $this->workChatMessage($data,$data['project_id']);
-        }
+        ProjectServer::useProject(535);
+        $data = $this->importVisit();
+        dd($data);
+        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 true;
         return true;
     }
     }
 
 
-    public function downloadProduct()
+    /**
+     * @remark :导出明细
+     * @name   :importVisit
+     * @author :lyh
+     * @method :post
+     * @time   :2025/4/8 11:34
+     */
+    public function importVisit()
     {
     {
-        $product = new Product();
-//        $filed = ['id', 'project_id', 'title' ,'thumb' , 'route' ,'intro','content',
-//            'category_id', 'status','seo_mate'];
-        $filed = ['id','title'];
-        $this->order = 'sort';
-        $lists = $product->list(['status'=>1],'id',$filed);
-        if(!empty($lists)){
-//            $cate_data = $this->getCategoryList();//分类
-            foreach ($lists as $k => $v){
-                echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
-//                $v['url'] = 'https://www.autsikinta.com/' . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);
-//                $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
-//                //ToDo::处理图片及文件
-//                if(!empty($v['thumb']) && !empty($v['thumb']['url'])){
-//                    $v['images'] = getImageUrl($v['thumb']['url']);
-//                }else{
-//                    $v['images'] = '';
-//                }
-                $lists[$k] = $v;
+        $lists = $this->model->list();
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists as $v){
+                $customer_visit_id[] = $v['id'];
             }
             }
-        }
-        return $lists;
-    }
-    public function categoryName($product_id,$data){
-        $cateRelatedModel = new CategoryRelated();
-        $category_id = $cateRelatedModel->where('product_id',$product_id)->pluck('cate_id')->toArray();
-        $category_name = '';
-        if(!empty($category_id) && !empty($data)){
-            foreach ($category_id as $v){
-                if(isset($data[$v])){
-                    $category_name .= $data[$v].',';
+            $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;
             }
             }
-            $category_name = trim($category_name,',');
         }
         }
-        return $category_name;
+        return $this->success($lists);
     }
     }
+
     /**
     /**
-     * @remark :获取所有分类
-     * @name   :getCategoryList
+     * @remark :导出访问明细
+     * @name   :exportData
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/9/14 13:56
+     * @time   :2025/4/8 11:32
      */
      */
-    public function getCategoryList(){
-        $data = Common::get_user_cache('product_category',1225);
-        if(empty($data)){
-            $categoryModel = new Category();
-            $data = [];
-            $cateList = $categoryModel->list(['project_id'=>1225],['id','title']);
-            if(!empty($cateList)){
-                foreach ($cateList as $value){
-                    $data[$value['id']] = $value['title'];
-                }
-            }
-            Common::set_user_cache($data,'product_category',1225);
+    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++;
         }
         }
-        return $data;
+        // 创建一个新的 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', '产品seo_title');
+////        $sheet->setCellValue('I1', '产品seo_keyword');
+////        $sheet->setCellValue('J1', '产品seo_title');
 //        $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']['title']);
+////            $sheet->setCellValue('I' . $rowCount, $v['seo_mate']['keyword']);
+////            $sheet->setCellValue('J' . $rowCount, $v['seo_mate']['description']);
 //            $rowCount++;
 //            $rowCount++;
 //        }
 //        }
 //        // 创建一个新的 Excel Writer 对象
 //        // 创建一个新的 Excel Writer 对象
@@ -143,69 +160,28 @@ class DownloadProject extends Command
 //        // 返回导出文件的响应
 //        // 返回导出文件的响应
 //        return ['file_link'=>url('upload/excel/'.$filename)];
 //        return ['file_link'=>url('upload/excel/'.$filename)];
 //    }
 //    }
-
-    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', '产品分类');
-//        $sheet->setCellValue('F1', '产品状态');
-//        $sheet->setCellValue('G1', '产品主图');
-//        $sheet->setCellValue('H1', '产品seo_title');
-//        $sheet->setCellValue('I1', '产品seo_keyword');
-//        $sheet->setCellValue('J1', '产品seo_title');
-        $rowCount = 2;
-        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('H' . $rowCount, $v['seo_mate']['title']);
-//            $sheet->setCellValue('I' . $rowCount, $v['seo_mate']['keyword']);
-//            $sheet->setCellValue('J' . $rowCount, $v['seo_mate']['description']);
-            $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 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;
+//    }
 
 
 }
 }