From 5c46dd5922df7ab7a90538bafbaf0ff9c51bcb65 Mon Sep 17 00:00:00 2001
From: xjh <2423579486@qq.com>
Date: Sat, 3 Jun 2023 10:48:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=90=8E=E7=AB=AF=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/resources/view/admin/controller.tpl       | 22 ++++-----
 .../business/sort/sortAdminController.tpl     | 45 +++++++++++--------
 .../view/business/sort/sortModel.tpl          |  6 +--
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/app/resources/view/admin/controller.tpl b/app/resources/view/admin/controller.tpl
index 49f29a9..8f45778 100644
--- a/app/resources/view/admin/controller.tpl
+++ b/app/resources/view/admin/controller.tpl
@@ -34,6 +34,17 @@ class {$className} extends BaseController
         return $isExport ?  $query->select()->toArray() : msg("获取{$functionName}列表成功!",$query);
     }
 
+    /**
+     * 添加{$functionName}
+     */
+    public function add{$className}(Request $request): array
+    {
+        $params = $request->param();
+        $this->validate($params, {$addRequireFields});
+        $model = Model{$className}::create($params,{$addAllowFields});
+        return msg('添加成功!');
+    }
+
     /**
      * 编辑{$functionName}
      */
@@ -47,17 +58,6 @@ class {$className} extends BaseController
         return msg('编辑成功!');
     }
 
-    /**
-     * 添加{$functionName}
-     */
-    public function add{$className}(Request $request): array
-    {
-        $params = $request->param();
-        $this->validate($params, {$addRequireFields});
-        $model = Model{$className}::create($params,{$addAllowFields});
-        return msg('添加成功!');
-    }
-
     /**
      * 删除{$functionName}
      */
diff --git a/app/resources/view/business/sort/sortAdminController.tpl b/app/resources/view/business/sort/sortAdminController.tpl
index 5d76776..ebd84ca 100644
--- a/app/resources/view/business/sort/sortAdminController.tpl
+++ b/app/resources/view/business/sort/sortAdminController.tpl
@@ -34,12 +34,34 @@ class {$className} extends BaseController
         return $isExport ?  $query->select()->toArray() : msg("获取{$functionName}列表成功!",$query);
     }
 
+    /**
+     * 添加{$functionName}
+     */
+    public function add{$className}(Request $request): array
+    {
+        Db::startTrans();
+        Tool::adminLockTableWrite('{$businessName}');
+        try {
+        $params = $request->param();
+        $this->validate($params, {$addRequireFields});
+        $model = Model{$className}::create($params,{$addAllowFields});
+        Db::commit();
+        Tool::unlockTable();
+        return msg('添加成功!');
+        } catch (\Throwable $th) {
+            Db::rollback();
+            Tool::unlockTable();
+            throw  $th;
+        }
+    }
+
     /**
      * 编辑{$functionName}
      */
     public function edit{$className}(Request $request): array
     {
         Db::startTrans();
+        Tool::adminLockTableWrite('{$businessName}');
         try {
         $params = $request->param();
         $this->validate($params, {$editRequireFields});
@@ -47,27 +69,11 @@ class {$className} extends BaseController
         if (!$model) throwErrorMsg("该{$functionName}不存在", 1);
         $model->allowField({$editAllowFields})->save($params);
         Db::commit();
+        Tool::unlockTable();
         return msg('编辑成功!');
         } catch (\Throwable $th) {
             Db::rollback();
-            throw  $th;
-        }
-    }
-
-    /**
-     * 添加{$functionName}
-     */
-    public function add{$className}(Request $request): array
-    {
-        Db::startTrans();
-        try {
-        $params = $request->param();
-        $this->validate($params, {$addRequireFields});
-        $model = Model{$className}::create($params,{$addAllowFields});
-        Db::commit();
-        return msg('添加成功!');
-        } catch (\Throwable $th) {
-            Db::rollback();
+            Tool::unlockTable();
             throw  $th;
         }
     }
@@ -78,6 +84,7 @@ class {$className} extends BaseController
     public function delete{$className}(Request $request): array
     {
         Db::startTrans();
+        Tool::adminLockTableWrite('{$businessName}');
         try {
         $params = $request->param();
         $this->validate($params, [
@@ -88,9 +95,11 @@ class {$className} extends BaseController
         ])->select();
         ${$businessName}->delete();
         Db::commit();
+        Tool::unlockTable();
         return msg('删除成功!');
         } catch (\Throwable $th) {
             Db::rollback();
+            Tool::unlockTable();
             throw  $th;
         }
     }
diff --git a/app/resources/view/business/sort/sortModel.tpl b/app/resources/view/business/sort/sortModel.tpl
index 9208ef5..24ca8f1 100644
--- a/app/resources/view/business/sort/sortModel.tpl
+++ b/app/resources/view/business/sort/sortModel.tpl
@@ -43,7 +43,7 @@ class {$className} extends BaseModel
     public static function onBeforeInsert(self $model): void
     {
         // self::checkRepeatData($model);
-        Tool::sortInsertProc(self::class, $model->{$orderField});
+        Tool::dataAddSortProc(self::class, $model->{$orderField});
         $model->completeCreateField();
     }
 
@@ -53,7 +53,7 @@ class {$className} extends BaseModel
     public static function onBeforeUpdate(self $model): void
     {
         // self::checkRepeatData($model);
-        Tool::sortEditProc(self::class, $model->{$businessName}_guid, $model->{$orderField});
+        Tool::dataEditSortProc(self::class, $model->{$businessName}_guid, $model->{$orderField});
         $model->completeUpdateField();
     }
 
@@ -62,7 +62,7 @@ class {$className} extends BaseModel
      */
     public static function onBeforeDelete(self $model): void
     {
-        Tool::sortDeleteProc(self::class, $model->{$businessName}_guid);
+        Tool::dataDeleteSortProc(self::class, $model->{$businessName}_guid);
         $model->completeDeleteField();
     }