变更数据

@@ -66,7 +66,7 @@ class BaseController extends Controller
                 $this->param['id'] = $id;
             }
         }
-        if(isset($this->param['project_id']) && !empty($this->param['project_id'])){
+        if(isset($this->param['project_id']) && !empty($this->param['project_id']) && !is_array($this->param['project_id'])){
             if (preg_match('/^[A-Za-z]/', $this->param['project_id'])) {
                 $id = Cache::get('project_'.$this->param['project_id']);
                 if(empty($id)){

@@ -5,6 +5,8 @@ namespace App\Http\Controllers\Bside\HomeCount;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\HomeCount\CountLogic;
+use App\Models\Project\Project;
+
 class CountController extends BaseController
 {
     const STATUS_ERROR = 400;
@@ -15,10 +17,6 @@ class CountController extends BaseController
      * @time   :2023/5/23 17:23
      */
     public function count(CountLogic $countLogic){
-        if($this->user['project_id'] == 5172){
-            $this->user['project_id'] = 3298;
-            $this->user['domain'] = 'https://www.annorobots.com/';
-        }
         $data = [];
         //TODO::昨日数据统计
         $data['yesterday'] = $countLogic->yesterday_count();
@@ -42,4 +40,16 @@ class CountController extends BaseController
         $data['enterprise_service'] = $countLogic->enterprise_service();
         return $this->response('success',Code::SUCCESS,$data);
     }
+
+    /**
+     * @remark :
+     * @name   :info5172count
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/6 15:10
+     */
+    public function info5172count()
+    {
+
+    }
 }

@@ -121,10 +121,11 @@ class GeoLogic extends BaseLogic
         if(empty($geo_question_count)){
             $geo_question_count = 0;
         }
-        $geo_pr_count = GeoLink::where('project_id',$this->param['project_id'])->count();
+        $geo_pr_count = GeoLink::where('project_id',$this->param['project_id'])->where('type',GeoLink::TYPE_NEWS)->count();
+        $geo_link_count = GeoLink::where('project_id',$this->param['project_id'])->where('type',GeoLink::TYPE_LINK)->count();
         $geo_writings_count = GeoWritings::where('project_id',$this->param['project_id'])->count();
         $geo_writings_count += GeoArticle::where('project_id',$this->param['project_id'])->count();
-        return $this->success(['geo_writings_count'=>$geo_writings_count,'geo_pr_count'=>$geo_pr_count,'geo_question_count'=>$geo_question_count]);
+        return $this->success(['geo_writings_count'=>$geo_writings_count,'geo_pr_count'=>$geo_pr_count,'geo_question_count'=>$geo_question_count,'geo_link_count'=>$geo_link_count]);
     }
 
 }

@@ -36,6 +36,9 @@ class CountLogic extends BaseLogic
      */
     public function yesterday_count(){
         $yesterday = Carbon::yesterday()->toDateString();
+        if($this->user['project_id'] == 5172){
+            $this->user['project_id'] = 3298;
+        }
         $param = [
             'date' => $yesterday,
             'project_id' => $this->user['project_id']
@@ -48,6 +51,39 @@ class CountLogic extends BaseLogic
         $inquiry_num = Cache::get('inquiry_num_'.$this->user['project_id']);
         if(empty($inquiry_num)){
             $domain = parse_url($this->user['domain'], PHP_URL_HOST); // 直接取域名部分
+            if($this->user['project_id'] == 5172){
+                $domain = 3298;
+            }
+            $inquiry_list = (new FormGlobalsoApi())->getInquiryAll($domain,$this->user['is_upgrade']);
+            if($inquiry_list !== false){
+                if(isset($inquiry_list['status']) && $inquiry_list['status'] != 400){
+                    $info['inquiry_num'] = $inquiry_list['data']['count'];
+                    Cache::add('inquiry_num_'.$this->user['project_id'],$inquiry_list['data']['count'],3600);
+                }
+            }
+        }
+        //获取项目的剩余时长
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['id'=>$this->user['project_id']],['remain_day','finish_remain_day']);
+        $info['service_day'] = $projectInfo['remain_day'];
+        $info['compliance_day'] = $projectInfo['finish_remain_day'];
+        return $this->success($info);
+    }
+
+    public function yesterday_5172_count(){
+        $yesterday = Carbon::yesterday()->toDateString();
+        $param = [
+            'date' => $yesterday,
+            'project_id' => 3298
+        ];
+        $info = $this->model->read($param,['pv_num','ip_num','inquiry_num','date','compliance_day','service_day','country']);
+        if($info === false){
+            $info = $this->model->read(['project_id' => $this->user['project_id']],
+                ['pv_num','ip_num','inquiry_num','date','compliance_day','service_day','country']);
+        }
+        $inquiry_num = Cache::get('inquiry_num_'.$this->user['project_id']);
+        if(empty($inquiry_num)){
+            $domain = parse_url($this->user['domain'], PHP_URL_HOST); // 直接取域名部分
             $inquiry_list = (new FormGlobalsoApi())->getInquiryAll($domain,$this->user['is_upgrade']);
             if($inquiry_list !== false){
                 if(isset($inquiry_list['status']) && $inquiry_list['status'] != 400){