Merge remote-tracking branch 'origin/master' into akun

@@ -108,6 +108,18 @@ class Project5CateController extends BaseController
         if ($response->successful()) {
         if ($response->successful()) {
             $result = $response->json(); // 获取 JSON 响应体
             $result = $response->json(); // 获取 JSON 响应体
             if($result && $result['status'] == 200){
             if($result && $result['status'] == 200){
+                //todo：：更新分类数据
+                $action1 = $project5CateModel->getCateTypeAction($this->param['type']);
+                $url1 = $projectInfo['website'].'wp-admin/admin-ajax.php?action='.$action1;
+                $data = http_get($url1);
+                if($data && $data['status'] == 200){
+                    $resultData  = $data['data'];
+                    $saveData = [
+                        'text'=>json_encode($data['data']),
+                    ];
+                    $project5CateModel->edit($saveData,['project_id' => $projectInfo['post_id'],'type'=>$this->param['type']]);
+                    $this->response('success', Code::SUCCESS,$resultData);
+                }
                 $this->response('success');
                 $this->response('success');
             }
             }
         }
         }

@@ -18,6 +18,7 @@ use App\Models\Product\Category;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Ticket\TicketUploadData;
 use App\Models\Ticket\TicketUploadData;
+use App\Models\WorkOrder\TicketProject;
 use App\Services\AiCommandService;
 use App\Services\AiCommandService;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
@@ -178,6 +179,7 @@ class TicketUploadDataController extends BaseController
         }
         }
         //验证当前数据是否已提交
         //验证当前数据是否已提交
         $this->param['text'] = json_encode($this->param['text'], true);
         $this->param['text'] = json_encode($this->param['text'], true);
+        $this->pushTicketByBot($this->param['project_id']);
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             //执行编辑
             //执行编辑
             $info = $this->model->read(['id'=>$this->param['id']]);
             $info = $this->model->read(['id'=>$this->param['id']]);
@@ -200,6 +202,22 @@ class TicketUploadDataController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :6.0数据推送微信
+     * @name   :pushTicketByBot
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/10 10:34
+     */
+    public function pushTicketByBot($project_id)
+    {
+        $project = TicketProject::where('table_id', $project_id)->where('project_cate',2)->where('is_del', 0)->first();
+        if (!$project){
+            return response()->json(['message' => '未找到对应的工单项目'], 404);
+        }
+        return $project->pushWechatGroupMsg("您好，用户已上传数据，请审核！");
+    }
+
+    /**
      * @remark :根据项目获取分类
      * @remark :根据项目获取分类
      * @name   :getProductCate
      * @name   :getProductCate
      * @author :lyh
      * @author :lyh

@@ -24,7 +24,7 @@ class GeoQuestionResLogic extends BaseLogic
         parent::__construct();
         parent::__construct();
         $this->model = new GeoQuestionResult();
         $this->model = new GeoQuestionResult();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
-        if($this->user['project_id'] == 5172){
+        if(isset($this->user['project_id']) && $this->user['project_id'] == 5172){
             $this->user['project_id'] = 3298;
             $this->user['project_id'] = 3298;
         }
         }
     }
     }