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

Lyh server



查看合并请求 !3083

@@ -68,4 +68,17 @@ class GeoController extends BaseController
         $data = $this->logic->saveConfig($this->param);
         $data = $this->logic->saveConfig($this->param);
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
+
+    /**
+     * @remark :统计数据
+     * @name   :getCount
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 10:37
+     */
+    public function getCount()
+    {
+        $data = $this->logic->getCount();
+        $this->response('success', Code::SUCCESS, $data);
+    }
 }
 }

@@ -78,8 +78,10 @@ class SettingFaqController extends BaseController
     {
     {
         $this->request->validate([
         $this->request->validate([
             'route'=>'required',
             'route'=>'required',
+            'qa'=>'required',
         ],[
         ],[
             'route.required' => '路由不能为空',
             'route.required' => '路由不能为空',
+            'qa.required' => 'qa不能为空',
         ]);
         ]);
         $data = $this->logic->saveFaq();
         $data = $this->logic->saveFaq();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -40,7 +40,7 @@ class GeoConfirmLogic extends BaseLogic
     public function saveConfirmContent($param)
     public function saveConfirmContent($param)
     {
     {
         try {
         try {
-            $info = $this->model->read(['project_id' => $param['project_id']]);
+            $info = $this->model->read(['project_id' => $param['project_id'],'type' => $param['type']]);
             if($info === false){
             if($info === false){
                 $id = $this->model->addReturnId($param);
                 $id = $this->model->addReturnId($param);
             }else{
             }else{

@@ -97,4 +97,16 @@ class GeoLogic extends BaseLogic
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);
     }
     }
 
 
+    /**
+     * @remark :获取统计数据
+     * @name   :getCount
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 10:39
+     */
+    public function getCount()
+    {
+
+    }
+
 }
 }