合并分支 'akun' 到 'master'

Akun



查看合并请求 !3357

@@ -127,13 +127,36 @@ class GeoQuestionController extends BaseController
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
+    /**
+     * 未命中问题列表
+     * @author Akun
+     * @date 2025/11/27 10:01
+     */
     public function unHitQuestionList(){
     public function unHitQuestionList(){
         $this->request->validate([
         $this->request->validate([
             'project_id'=>'required',
             'project_id'=>'required',
         ],[
         ],[
             'project_id.required' => '项目ID不能为空',
             'project_id.required' => '项目ID不能为空',
         ]);
         ]);
-        $data = $this->logic->getUnHitQuestionList();
+        $data = $this->logic->unHitQuestionList();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
+
+    /**
+     * 删除未命中问题
+     * @author Akun
+     * @date 2025/11/27 10:34
+     */
+    public function delUnHitQuestion(){
+        $this->request->validate([
+            'project_id'=>'required',
+            'question'=>'required',
+        ],[
+            'project_id.required' => '项目ID不能为空',
+            'question.required' => '问题不能为空',
+        ]);
+
+        $this->logic->delUnHitQuestion();
+        $this->response('success',Code::SUCCESS);
+    }
 }
 }

@@ -14,6 +14,7 @@ use App\Models\Geo\GeoPlatform;
 use App\Models\Geo\GeoQuestion;
 use App\Models\Geo\GeoQuestion;
 use App\Models\Geo\GeoQuestionResult;
 use App\Models\Geo\GeoQuestionResult;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use Illuminate\Support\Facades\DB;
 
 
 class GeoQuestionLogic extends BaseLogic
 class GeoQuestionLogic extends BaseLogic
 {
 {
@@ -138,12 +139,12 @@ class GeoQuestionLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * 获取未名字的问题列表
+     * 获取未命中的问题列表
      * @return array
      * @return array
      * @author Akun
      * @author Akun
      * @date 2025/11/25 16:44
      * @date 2025/11/25 16:44
      */
      */
-    public function getUnHitQuestionList(){
+    public function unHitQuestionList(){
         $data = GeoQuestionResult::where('project_id',$this->param['project_id'])->where('hit',0)->select('platform','question')->get()->toArray();
         $data = GeoQuestionResult::where('project_id',$this->param['project_id'])->where('hit',0)->select('platform','question')->get()->toArray();
         $list = [];
         $list = [];
         if(!empty($data)){
         if(!empty($data)){
@@ -160,10 +161,41 @@ class GeoQuestionLogic extends BaseLogic
 
 
             if(!empty($temp)){
             if(!empty($temp)){
                 foreach ($temp as $kt=>$vt){
                 foreach ($temp as $kt=>$vt){
-                    $list[] = ['question'=>$kt,'platform'=>$vt];
+                    $list[] = ['question'=>$kt,'platform'=>array_unique($vt)];
                 }
                 }
             }
             }
         }
         }
         return $this->success($list);
         return $this->success($list);
     }
     }
+
+    /**
+     * 删除未命中问题
+     * @throws \App\Exceptions\AsideGlobalException
+     * @throws \App\Exceptions\BsideGlobalException
+     * @author Akun
+     * @date 2025/11/27 10:51
+     */
+    public function delUnHitQuestion(){
+        $question = $this->param['question'];
+        $project_id = $this->param['project_id'];
+
+        DB::beginTransaction();
+        try {
+            //删除问题结果
+            $resultModel = new GeoQuestionResult();
+            $resultModel->del([
+                'project_id' => $project_id,
+                'question' => $question
+            ]);
+
+            //删除问题
+            $lists = $this->model->select(['id','question'])->where('project_id', $project_id)->whereJsonContains('question', [['Value' => $question]])->get()->toArray();
+            dd($lists);
+
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('删除问题失败， error：' . $e->getMessage());
+        }
+    }
 }
 }

@@ -575,6 +575,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/saveGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'saveGeoQuestion'])->name('admin.geo_question_saveGeoQuestion');
             Route::any('/saveGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'saveGeoQuestion'])->name('admin.geo_question_saveGeoQuestion');
             Route::any('/delGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'delGeoQuestion'])->name('admin.geo_question_delGeoQuestion');
             Route::any('/delGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'delGeoQuestion'])->name('admin.geo_question_delGeoQuestion');
             Route::any('/unHitQuestionList', [Aside\Geo\GeoQuestionController::class, 'unHitQuestionList'])->name('admin.geo_question_unHitQuestionList');
             Route::any('/unHitQuestionList', [Aside\Geo\GeoQuestionController::class, 'unHitQuestionList'])->name('admin.geo_question_unHitQuestionList');
+            Route::any('/delUnHitQuestion', [Aside\Geo\GeoQuestionController::class, 'delUnHitQuestion'])->name('admin.geo_question_delUnHitQuestion');
         });
         });
         //文章列表
         //文章列表
         Route::prefix('article')->group(function () {
         Route::prefix('article')->group(function () {