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

@@ -9,7 +9,11 @@
 
 
 namespace App\Http\Controllers\Aside\Geo;
 namespace App\Http\Controllers\Aside\Geo;
 
 
+use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Geo\GeoWritingsLogic;
+use App\Http\Requests\Aside\Geo\GeoWritingsRequest;
+use Illuminate\Http\Request;
 
 
 /**
 /**
  * @remark :geo文章
  * @remark :geo文章
@@ -20,5 +24,54 @@ use App\Http\Controllers\Aside\BaseController;
  */
  */
 class GeoWritingsController extends BaseController
 class GeoWritingsController extends BaseController
 {
 {
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->logic = new GeoWritingsLogic();
+    }
+
+    /**
+     * @remark :文章列表数据
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:53
+     */
+    public function lists(){
+        $data = $this->logic->listWriting($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :保存geoAi文章生成数据
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 10:41
+     */
+    public function saveWriting(){
+        $request = new GeoWritingsRequest();
+        $request->validated();
+        $data = $this->logic->saveWriting();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :批量删除文章任务
+     * @name   :delWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:03
+     */
+    public function delWriting(){
+        $this->request->validate([
+            'id'=>'required|array',
+        ],[
+            'id.required' => 'ID不能为空',
+            'id.array' => 'ID为数组',
+        ]);
+        $data = $this->logic->delWriting();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 
 
 }
 }

@@ -27,4 +27,53 @@ class GeoWritingsLogic extends BaseLogic
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
         $this->model = new GeoWritings();
         $this->model = new GeoWritings();
     }
     }
+
+    /**
+     * @remark :列表数据
+     * @name   :listWriting
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:57
+     */
+    public function listWriting($map,$page,$row,$order){
+        $data = $this->model->lists($map,$page,$row,$order);
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :手动上传数据
+     * @name   :saveWriting
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 16:07
+     */
+    public function saveWriting(){
+        try {
+            if(isset($this->param['id']) &&!empty($this->param['id'])){
+                $id = $this->param['id'];
+                $this->model->edit($this->param,['id'=>$id]);
+            }else{
+                $id = $this->model->addReturnId($this->param);
+            }
+        }catch (\Exception $e){
+            $this->fail('保存数据失败，请联系管理员'.$e->getMessage());
+        }
+        return $this->success(['id'=>$id]);
+    }
+
+    /**
+     * @remark :删除数据
+     * @name   :delWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 15:05
+     */
+    public function delWriting()
+    {
+        $res = $this->model->del(['id'=>['in',$this->param['id']]]);
+        if($res === false){
+            $this->fail('删除失败，请联系管理员');
+        }
+        return $this->success();
+    }
 }
 }

+<?php
+/**
+ * @remark :
+ * @name   :GeoWritingsTaskRequest.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/25 14:21
+ */
+
+namespace App\Http\Requests\Aside\Geo;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class GeoWritingsRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'project_id' => 'required',
+            'title' => 'required|string',
+            'content' => 'required|string',
+        ];
+    }
+}

@@ -601,6 +601,12 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/saveWritingTask', [Aside\Geo\GeoWritingTaskController::class, 'saveWritingTask'])->name('admin.geo_writing_task_saveWritingTask');
             Route::any('/saveWritingTask', [Aside\Geo\GeoWritingTaskController::class, 'saveWritingTask'])->name('admin.geo_writing_task_saveWritingTask');
             Route::any('/delWritingTask', [Aside\Geo\GeoWritingTaskController::class, 'delWritingTask'])->name('admin.geo_writing_task_delWritingTask');
             Route::any('/delWritingTask', [Aside\Geo\GeoWritingTaskController::class, 'delWritingTask'])->name('admin.geo_writing_task_delWritingTask');
         });
         });
+        //geo文章管理
+        Route::prefix('writing')->group(function () {
+            Route::any('/', [Aside\Geo\GeoWritingsController::class, 'lists'])->name('admin.geo_writing_task');
+            Route::any('/saveWriting', [Aside\Geo\GeoWritingsController::class, 'saveWriting'])->name('admin.geo_writing_saveWriting');
+            Route::any('/delWriting', [Aside\Geo\GeoWritingsController::class, 'delWriting'])->name('admin.geo_writing_delWriting');
+        });
     });
     });
     // 任务相关
     // 任务相关
     Route::prefix('task')->group(function () {
     Route::prefix('task')->group(function () {