From 1724bf8afb60df1d358961907b56c2efe084466b Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Thu, 13 Feb 2025 15:25:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8E=92=E5=BA=8F=E5=80=BC=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/Article.php   | 26 +++++++++++++++++++++++---
 app/admin/model/v1/ArticleModel.php   |  6 ------
 app/admin/route/v1.php                |  3 +++
 app/common/model/ArticleBaseModel.php |  4 +---
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/admin/controller/v1/Article.php b/app/admin/controller/v1/Article.php
index f982bcb1..d53a18b4 100644
--- a/app/admin/controller/v1/Article.php
+++ b/app/admin/controller/v1/Article.php
@@ -75,7 +75,7 @@ class Article
                 'updated_at',
                 'deleted_at',
             ])
-            ->id(request()->param('id'))
+            ->bypk(request()->param('id'))
             ->find();
         if (is_null($article)) {
             return error('文章不存在');
@@ -143,7 +143,7 @@ class Article
             return error($validate->getError());
         }
 
-        $article = ArticleModel::id($id)->find();
+        $article = ArticleModel::bypk($id)->find();
         if (is_null($article)) {
             return error('请确认操作对象是否存在');
         }
@@ -154,11 +154,31 @@ class Article
         return success('操作成功');
     }
 
+    // 设置排序值
+    public function sort()
+    {
+        $id   = request()->param('id');
+        $sort = request()->post('sort');
+
+        $article = ArticleModel::bypk($id)->find();
+        if (empty($article)) {
+            return error('请确认操作对象是否存在');
+        }
+        if ($sort != $article->sort) {
+            $article->sort = $sort;
+            if (!$article->save()) {
+                return error('操作失败');
+            }
+        }
+        
+        return success('操作成功');
+    }
+
     // 删除文章
     public function delete()
     {
         $id = request()->param('id');
-        $article = ArticleModel::id($id)->find();
+        $article = ArticleModel::bypk($id)->find();
         if (is_null($article)) {
             return error('请确认操作对象是否存在');
         }
diff --git a/app/admin/model/v1/ArticleModel.php b/app/admin/model/v1/ArticleModel.php
index 88115493..87436d04 100644
--- a/app/admin/model/v1/ArticleModel.php
+++ b/app/admin/model/v1/ArticleModel.php
@@ -40,12 +40,6 @@ class ArticleModel extends ArticleBaseModel
         }
     }
 
-    // 主键查询
-    public function scopeId($query, $value)
-    {
-        $query->where('id', '=', $value);
-    }
-
     // 语言查询
     public function scopeLanguage($query, $value)
     {
diff --git a/app/admin/route/v1.php b/app/admin/route/v1.php
index fb8bb9e2..097ed8c4 100644
--- a/app/admin/route/v1.php
+++ b/app/admin/route/v1.php
@@ -55,6 +55,9 @@ Route::group('v1', function () {
         // 文章更新
         Route::put('update/:id', 'Article/update');
 
+        // 设置排序值
+        Route::post('sort/:id', 'Article/sort');
+
         // 文章删除
         Route::delete('delete/:id', 'Article/delete');
 
diff --git a/app/common/model/ArticleBaseModel.php b/app/common/model/ArticleBaseModel.php
index 33334118..a3e9b216 100644
--- a/app/common/model/ArticleBaseModel.php
+++ b/app/common/model/ArticleBaseModel.php
@@ -3,12 +3,10 @@ declare (strict_types = 1);
 
 namespace app\common\model;
 
-use think\Model;
-
 /**
  * @mixin \think\Model
  */
-class ArticleBaseModel extends Model
+class ArticleBaseModel extends BaseModel
 {
     // 表名
     protected $name = 'article';