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

Lyh server



查看合并请求 !2557

@@ -113,6 +113,23 @@ class GeoQuestionRes extends Command
                     }
                     }
                     // 命中文案
                     // 命中文案
                     $hit_data[] = $result['text'];
                     $hit_data[] = $result['text'];
+                    if(!empty($taskInfo['expect_result'])){
+                        $str = "客户提出的问题:{$question}，客户得到的回复:{$result['text']}，客户需要预期:{$taskInfo['expect_result']}，请分析得到的回复和预期是否一致，仅回复我是或者否";
+                        $data = $geo_service->getChatResult($str, 'gpt-4o-mini');
+                        if(isset($data['text']) && !empty($data['text'])){
+                            switch ($data['text']){
+                                case '是':
+                                    $is_match = 1;
+                                    break;
+                                case '否':
+                                    $is_match = 2;
+                                    break;
+                                default:
+                                    $is_match = 0;
+                                    break;
+                            }
+                        }
+                    }
                     if(!empty($result['annotations'])){
                     if(!empty($result['annotations'])){
                         $url = array_column(array_column($result['annotations'], 'url_citation'), 'url');
                         $url = array_column(array_column($result['annotations'], 'url_citation'), 'url');
                         $title = array_column(array_column($result['annotations'], 'url_citation'), 'title');
                         $title = array_column(array_column($result['annotations'], 'url_citation'), 'title');
@@ -144,6 +161,7 @@ class GeoQuestionRes extends Command
                         'hit' => $hit ?? 0,
                         'hit' => $hit ?? 0,
                         'keywords_num'=>$keyword_num ?? [],
                         'keywords_num'=>$keyword_num ?? [],
                         'url_num'=>$url_num ?? [],
                         'url_num'=>$url_num ?? [],
+                        'is_match'=>$is_match ?? 0,
                         'created_at'=>date('Y-m-d H:i:s'),
                         'created_at'=>date('Y-m-d H:i:s'),
                         'updated_at'=>date('Y-m-d H:i:s'),
                         'updated_at'=>date('Y-m-d H:i:s'),
                     ];
                     ];
@@ -294,6 +312,17 @@ class GeoQuestionRes extends Command
     }
     }
 
 
     /**
     /**
+     * @remark :预期结果对比
+     * @name   :getExpectResult
+     * @author :lyh
+     * @method :post
+     * @time   :2025/8/12 13:51
+     */
+    public function getExpectResult($question,$answer,$expect){
+        $str = "客户提出的问题:{$question}，客户得到的回复:{$answer}，客户需要预期:{$expect}，请分析得到的回复和预期是否一致，仅回复我是或者否";
+    }
+
+    /**
      * 获取待执行任务ID
      * 获取待执行任务ID
      * @return mixed
      * @return mixed
      */
      */

@@ -50,17 +50,22 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        echo 'start.'. PHP_EOL;
-        $ticketModel = new Tickets();
-        $list = $ticketModel->list(['id'=>['!=',0]],'id',['id','plan_end_at']);
-        foreach ($list as $item){
-            echo '执行数据id:'.$item['id'].PHP_EOL;
-            $ticketLogModel = new TicketLog();
-            $ticketLogModel->edit(['plan_end_at'=>$item['plan_end_at']],['ticket_id'=>$item['id']]);
-        }
+        return $this->getExpectResult();
         return true;
         return true;
     }
     }
 
 
+    public function getExpectResult(){
+        $geo_service = new GeoService();
+        $question = 'Top AI Coffee Robot';
+        $answer = "Top AI Coffee Robot\" refers to advanced robotic systems that combine **precision automation, artificial intelligence, and specialty coffee expertise** to create high-quality beverages with minimal human intervention. Here's a breakdown of key features, leading examples, and benefits:\n\n### Core Features of Top AI Coffee Robots:\n1. **AI-Driven Customization**  \n   - Analyzes user preferences (strength, milk type, sweetness) via app profiles or voice commands.  \n   - Learns from feedback to refine future orders (e.g., \"less bitter than last time\").  \n2. **Robotic Precision Brewing**  \n   - Industrial arms handle grinding, tamping, steaming milk, and latte art with sub-millimeter accuracy.  \n   - Sensors monitor temperature, extraction time, and pressure for optimal flavor.";
+        $expect = "While I don't have specific information on the RobotAnno coffee machine, in general";
+        $str = "客户提出的问题:{$question}，客户得到的回复:{$answer}，客户需要预期:{$expect}，请分析得到的回复和预期是否一致，仅回复我是或者否";
+        $data = $geo_service->getChatResult($str, 'gpt-4o-mini');
+        if(isset($data['text']) && $data['text'] == '是'){
+
+        }
+    }
+
     /**
     /**
      * @remark :查看路由是否为空
      * @remark :查看路由是否为空
      * @name   :_actionRoute
      * @name   :_actionRoute

@@ -48,7 +48,7 @@ class GeoQuestionResLogic extends BaseLogic
      */
      */
     public function getResultList($map = [],$page = 1,$row = 20){
     public function getResultList($map = [],$page = 1,$row = 20){
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
-        $filed = ['id','project_id','question_id','platform','question','en_question','keywords','url','created_at','updated_at'];
+        $filed = ['id','project_id','question_id','platform','is_match','question','en_question','keywords','url','created_at','updated_at'];
         if(!empty($map['created_at'])){
         if(!empty($map['created_at'])){
             $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();