Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -75,7 +75,7 @@ class GeoCount extends Command
                 'total'=>$total,//收录总数
                 'total'=>$total,//收录总数
             ];
             ];
             foreach ($platforms as $platform){
             foreach ($platforms as $platform){
-                if($item == 'openai-not-network'){
+                if($platform == 'openai-not-network'){
                     $data['openai_not_network'] = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'platform'=>$platform,'created_at' => ['between',[$start,$end]]]);
                     $data['openai_not_network'] = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'platform'=>$platform,'created_at' => ['between',[$start,$end]]]);
                 }else{
                 }else{
                     $data[$platform] = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'platform'=>$platform,'created_at' => ['between',[$start,$end]]]);
                     $data[$platform] = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'platform'=>$platform,'created_at' => ['between',[$start,$end]]]);

+<?php
+/**
+ * @remark :
+ * @name   :GeoCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/13 16:05
+ */
+
+namespace App\Console\Commands\Geo;
+
+use App\Models\Geo\GeoQuestionLog;
+use App\Models\Geo\GeoQuestionResult;
+use Illuminate\Console\Command;
+use Illuminate\Support\Carbon;
+use App\Models\Geo\GeoCount as GeoCountModel;
+
+class GeoCountAll extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'geo_count_all';
+
+    public $porject_id;//记录当时执行的project_id
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'geo统计数据';
+
+
+
+    public function handle(){
+        $this->output('start');
+        $this->_action();
+        $this->output('end');
+        return true;
+    }
+
+    /**
+     * @remark :方法
+     * @name   :_action
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/13 16:20
+     */
+    public function _action()
+    {
+        $geoCountModel = new GeoCountModel();
+        //获取前一天的项目id
+        $dates = [];
+        for ($i = 0; $i < 100; $i++) {
+            $dates[] = date('Y-m-d', strtotime("-{$i} days"));
+        }
+        foreach ($dates as $date) {
+            $start = $date.' 00:00:00';
+            $end = $date.' 23:59:59';
+            $geoLogModel = new GeoQuestionLog();
+            $project_id = $geoLogModel->formatQuery(['created_at' => ['between',[$start,$end]]])->distinct()->pluck('project_id');
+            if(empty($project_id)){
+                return true;
+            }
+            $geoQuestionResModel = new GeoQuestionLog();
+            $platforms = ['gemini','openai','deepseek','poe','perplexity','google_ai_overview','openai-not-network','claude'];
+            foreach ($project_id as $item){
+                $this->output('执行的项目ID----'.$item);
+                //收录总数
+                $total = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'created_at' => ['between',[$start,$end]]]);
+                $data = [
+                    'project_id' => $item,
+                    'date' => $date,
+                    'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
+                    'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
+                    'total'=>$total,//收录总数
+                ];
+                foreach ($platforms as $platform){
+                    if($platform == 'openai-not-network'){
+                        $data['openai_not_network'] = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'platform'=>$platform,'created_at' => ['between',[$start,$end]]]);
+                    }else{
+                        $data[$platform] = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'platform'=>$platform,'created_at' => ['between',[$start,$end]]]);
+                    }
+                }
+                $info = $geoCountModel->read(['project_id' => $item,'date'=>$date]);
+                if($info === false){
+                    //新增一条数据
+                    $geoCountModel->addReturnId($data);
+                }else{
+                    $geoCountModel->edit($data,['id'=>$info['id']]);
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 输出日志
+     * @param $message
+     * @return bool
+     */
+    public function output($message)
+    {
+        echo date('Y-m-d H:i:s') . ' ' . $message . PHP_EOL;
+        return true;
+    }
+}

@@ -129,4 +129,16 @@ class GeoQuestionResController extends BaseController
         $data = $this->logic->getLabelData();
         $data = $this->logic->getLabelData();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
+
+    /**
+     * @remark :根据项目获取
+     * @name   :getPlatformCount
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/14 10:43
+     */
+    public function getPlatformCount(){
+        $data = $this->logic->getPlatformCount();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -10,6 +10,7 @@
 namespace App\Http\Logic\Bside\Geo;
 namespace App\Http\Logic\Bside\Geo;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Geo\GeoCount;
 use App\Models\Geo\GeoPlatform;
 use App\Models\Geo\GeoPlatform;
 use App\Models\Geo\GeoQuestion;
 use App\Models\Geo\GeoQuestion;
 use App\Models\Geo\GeoQuestionLog;
 use App\Models\Geo\GeoQuestionLog;
@@ -200,4 +201,18 @@ class GeoQuestionResLogic extends BaseLogic
         }
         }
         return $this->success($data);
         return $this->success($data);
     }
     }
+
+    /**
+     * @remark :获取图标数据
+     * @name   :getPlatformCount
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/14 10:45
+     */
+    public function getPlatformCount()
+    {
+        $geoCountModel = new GeoCount();
+        $lists = $geoCountModel->list(['project_id'=>$this->user['project_id']],'date',['*'],'desc',30);
+        return $this->success($lists);
+    }
 }
 }

@@ -766,6 +766,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/getCount', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getCount'])->name('geo_result_getCount');//geo设置类型统计数量
         Route::any('/getCount', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getCount'])->name('geo_result_getCount');//geo设置类型统计数量
         Route::any('/countQuantity', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'countQuantity'])->name('geo_result_countQuantity');//geo统计
         Route::any('/countQuantity', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'countQuantity'])->name('geo_result_countQuantity');//geo统计
         Route::any('/getSearchDate', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getSearchDate'])->name('geo_result_getSearchDate');//搜索记录时间
         Route::any('/getSearchDate', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getSearchDate'])->name('geo_result_getSearchDate');//搜索记录时间
+        Route::any('/getPlatformCount', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getPlatformCount'])->name('geo_result_getPlatformCount');//搜索记录时间
     });
     });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组