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

@@ -50,7 +50,7 @@ class GeoQuestionResLogic extends BaseLogic
         $filed = ['id','project_id','question_id','platform','question','en_question','keywords','url','created_at','updated_at'];
         $filed = ['id','project_id','question_id','platform','question','en_question','keywords','url','created_at','updated_at'];
         if(!empty($map['created_at'])){
         if(!empty($map['created_at'])){
             $map['project_id'] = $this->user['project_id'];
             $map['project_id'] = $this->user['project_id'];
-            $map['created_at'] = ['between',[$map['created_at'].' 00:00:00',$map['created_at'].'23:59:59']];
+            $map['created_at'] = ['between',[$map['created_at'].' 00:00:00',$map['created_at'].' 23:59:59']];
             $this->model = new GeoQuestionLog();
             $this->model = new GeoQuestionLog();
         }
         }
         $query = $this->model->formatQuery($map);
         $query = $this->model->formatQuery($map);
@@ -83,23 +83,22 @@ class GeoQuestionResLogic extends BaseLogic
      */
      */
     public function countQuantity(){
     public function countQuantity(){
         $questionModel = new GeoQuestion();
         $questionModel = new GeoQuestion();
-        $list = $questionModel->list(['project_id',$this->user['project_id']],['question','keywords','url']);
+        $list = $questionModel->list(['project_id'=>$this->user['project_id']],['question','keywords','url']);
         $questionTotalCount = $urlTotalCount = $keywordsTotalCount = $keywordUrlCount = 0;
         $questionTotalCount = $urlTotalCount = $keywordsTotalCount = $keywordUrlCount = 0;
         foreach ($list as $item){
         foreach ($list as $item){
             $questionTotalCount += count($item['question'] ?? []);
             $questionTotalCount += count($item['question'] ?? []);
             $keywordsTotalCount += count($item['keywords'] ?? []);
             $keywordsTotalCount += count($item['keywords'] ?? []);
             $urlTotalCount += count($item['url'] ?? []);
             $urlTotalCount += count($item['url'] ?? []);
         }
         }
+        $keywordUrlCount = 0;
         $keywordArr = [];
         $keywordArr = [];
-        $questionResModel = new GeoQuestionResult();
-        $resList = $questionResModel->list(['project_id',$this->user['project_id']],['keywords_num','url_num']);
+        $questionResModel = new GeoQuestionLog();
+        $resList = $questionResModel->list(['project_id'=>$this->user['project_id']],['keywords','url','keywords_num','url_num']);
         foreach ($resList as $resItem){
         foreach ($resList as $resItem){
-            $keywordsNumArr = json_decode($resItem['keywords_num'] ?? [], true); // 转为 PHP 关联数组
-            $keywordUrlCount += array_sum($keywordsNumArr); // 获取值的总和
-            $urlNumArr = json_decode($resItem['url'] ?? [],true);
-            $keywordUrlCount += array_sum($urlNumArr); // 获取值的总和
+            $keywordUrlCount += count($resItem['keywords']);
+            $keywordUrlCount += count($resItem['url']);
             foreach ($resItem['keywords_num'] as $key => $value) {
             foreach ($resItem['keywords_num'] as $key => $value) {
-                $keywordArr[$key] = ($keywordArr[$key] ?? 0) + $value;
+                $keywordArr[$key] = ($keywordArr[$key] ?? 0) + (($value != 0) ? 1 : 0);
             }
             }
         }
         }
         $data = [
         $data = [

@@ -9,6 +9,7 @@
 
 
 namespace App\Models\Geo;
 namespace App\Models\Geo;
 
 
+use App\Helper\Arr;
 use App\Models\Base;
 use App\Models\Base;
 
 
 /**
 /**
@@ -21,4 +22,80 @@ use App\Models\Base;
 class GeoQuestionLog extends Base
 class GeoQuestionLog extends Base
 {
 {
     protected $table = 'gl_geo_question_log';
     protected $table = 'gl_geo_question_log';
+
+    /**
+     * @remark :geo提交关键字获取器
+     * @name   :getUrlAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/3 9:53
+     */
+    public function getKeywordsAttribute($value)
+    {
+        if($value){
+            $value = Arr::s2a($value);
+        }
+        return $value;
+    }
+
+    /**
+     * @remark :geo提交网址获取器
+     * @name   :getUrlAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/3 9:52
+     */
+    public function getUrlAttribute($value)
+    {
+        if($value){
+            $value = Arr::s2a($value);
+        }
+        return $value;
+    }
+
+    /**
+     * @remark :geo提交结果获取器
+     * @name   :getUrlAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/3 9:52
+     */
+    public function getTextAttribute($value)
+    {
+        if($value){
+            $value = Arr::s2a($value);
+        }
+        return $value;
+    }
+
+    /**
+     * @remark :命中的关键词数量
+     * @name   :getKeywordsNumAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/21 11:33
+     */
+    public function getKeywordsNumAttribute($value)
+    {
+        if($value){
+            $value = Arr::s2a($value);
+        }
+        return $value;
+    }
+
+    /**
+     * @remark :命中的url数量
+     * @name   :getUrlNumAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/21 11:34
+     */
+    public function getUrlNumAttribute($value)
+    {
+        if($value){
+            $value = Arr::s2a($value);
+        }
+        return $value;
+    }
+
 }
 }