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

Lyh server



查看合并请求 !2947

+<?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;
+
+class GeoCount extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'geo_count';
+
+    public $porject_id;//记录当时执行的project_id
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'geo统计数据';
+
+
+
+    public function handle(){
+
+    }
+
+    /**
+     * @remark :方法
+     * @name   :_action
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/13 16:20
+     */
+    public function _action()
+    {
+        //获取前一天的项目id
+        $date = Carbon::yesterday()->format('Y-m-d');
+        $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 GeoQuestionResult();
+        $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){
+                $data[$platform] = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'platform'=>$platform,'created_at' => ['between',[$start,$end]]]);
+            }
+            //新增一条数据
+            $geoQuestionResModel->addReturnId($data);
+        }
+        return true;
+    }
+
+    /**
+     * 输出日志
+     * @param $message
+     * @return bool
+     */
+    public function output($message)
+    {
+        echo date('Y-m-d H:i:s') . ' ' . $message . PHP_EOL;
+        return true;
+    }
+}

@@ -93,8 +93,9 @@ class AsideTicketLogController extends BaseController
                         $ticket->end_at = now();
                         $ticket->end_at = now();
                         $ticket->end_time = diffInHours($ticket->created_at,$ticket->end_at);
                         $ticket->end_time = diffInHours($ticket->created_at,$ticket->end_at);
                         $project = $ticket->project;
                         $project = $ticket->project;
-                        if ($project->wechat_switch && !$ticket->close_wechat)
+                        if ($project->wechat_switch && !$ticket->close_wechat){
                             $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
                             $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
+                        }
                         $ticket->pushDing('finish');
                         $ticket->pushDing('finish');
                     }else{
                     }else{
                     $ticket->status = Tickets::STATUS_YANSHOU;
                     $ticket->status = Tickets::STATUS_YANSHOU;