From 935caa24f2ac553283513060333cd5ba96a19611 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 2 Sep 2025 11:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysDictCategoryController.php  | 48 ++++++++++++++++++
 app/admin/controller/VehColorController.php   | 31 +++++++++---
 app/admin/logic/SysDictCategoryLogic.php      | 17 +++++++
 app/admin/service/SysDictCategoryService.php  | 31 ++++++++++++
 .../validate/SysDictCategoryValidate.php      | 29 +++++++++++
 app/common/model/SysCurrency.php              |  2 +-
 app/common/model/SysDictCategory.php          | 49 +++++++++++++++++++
 config/route.php                              |  9 ++++
 8 files changed, 207 insertions(+), 9 deletions(-)
 create mode 100644 app/admin/controller/SysDictCategoryController.php
 create mode 100644 app/admin/logic/SysDictCategoryLogic.php
 create mode 100644 app/admin/service/SysDictCategoryService.php
 create mode 100644 app/admin/validate/SysDictCategoryValidate.php
 create mode 100644 app/common/model/SysDictCategory.php

diff --git a/app/admin/controller/SysDictCategoryController.php b/app/admin/controller/SysDictCategoryController.php
new file mode 100644
index 0000000..a75980d
--- /dev/null
+++ b/app/admin/controller/SysDictCategoryController.php
@@ -0,0 +1,48 @@
+<?php
+namespace app\admin\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\admin\service\SysDictCategoryService;
+
+class SysDictCategoryController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new SysDictCategoryService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+     protected function indexFormat($data)
+     {
+         if (isset($data['created_at']))
+             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+         if (isset($data['updated_at']))
+             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+         return $data;
+     }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at']))
+            $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at']))
+            $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/app/admin/controller/VehColorController.php b/app/admin/controller/VehColorController.php
index 0d208ae..9f17c7c 100644
--- a/app/admin/controller/VehColorController.php
+++ b/app/admin/controller/VehColorController.php
@@ -22,12 +22,27 @@ class VehColorController extends BaseController
      * @param array $data
      * @return array
      */
-    // protected function indexFormat($data)
-    // {
-    //     if (isset($data['created_at']))
-    //         $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
-    //     if (isset($data['updated_at']))
-    //         $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
-    //     return $data;
-    // }
+    protected function indexFormat($data)
+    {
+        if (isset($data['created_at']))
+            $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at']))
+            $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        return $data;
+    }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at']))
+            $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at']))
+            $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        return $data;
+    }
 }
\ No newline at end of file
diff --git a/app/admin/logic/SysDictCategoryLogic.php b/app/admin/logic/SysDictCategoryLogic.php
new file mode 100644
index 0000000..c52cb72
--- /dev/null
+++ b/app/admin/logic/SysDictCategoryLogic.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\admin\logic;
+
+use app\common\traits\crud\CrudLogicTrait;
+use app\common\model\SysDictCategory;
+
+class SysDictCategoryLogic
+{
+    use CrudLogicTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = SysDictCategory::class;
+
+}
\ No newline at end of file
diff --git a/app/admin/service/SysDictCategoryService.php b/app/admin/service/SysDictCategoryService.php
new file mode 100644
index 0000000..69ab18f
--- /dev/null
+++ b/app/admin/service/SysDictCategoryService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace app\admin\service;
+
+use app\admin\validate\SysDictCategoryValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\SysDictCategory;
+
+class SysDictCategoryService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = SysDictCategory::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = SysDictCategoryValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return  new $this->validator;
+    }
+}
\ No newline at end of file
diff --git a/app/admin/validate/SysDictCategoryValidate.php b/app/admin/validate/SysDictCategoryValidate.php
new file mode 100644
index 0000000..f494854
--- /dev/null
+++ b/app/admin/validate/SysDictCategoryValidate.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class SysDictCategoryValidate extends Validate
+{
+    // 规则
+    protected $rule = [
+        
+    ];
+
+    // 提示
+    protected $message = [
+        
+    ];
+
+    // 场景
+    protected $scene = [
+        'store' => [
+            
+        ],
+
+        'update' => [
+            
+        ]
+    ];
+}
\ No newline at end of file
diff --git a/app/common/model/SysCurrency.php b/app/common/model/SysCurrency.php
index 200a23b..a13d120 100644
--- a/app/common/model/SysCurrency.php
+++ b/app/common/model/SysCurrency.php
@@ -40,7 +40,7 @@ class SysCurrency extends Model
     /**
      * 允许自动填充模型字段
      */
-    protected $fillable = ['id', 'currency_code', 'currency_name', 'currency_symbol', 'exchange_rate', 'base_currency', 'float_percent', 'status', 'last_updated', 'created_at', 'updated_at'];
+    protected $fillable = ['id', 'currency_code', 'currency_name', 'currency_symbol', 'exchange_rate', 'base_currency', 'float_percent_up', 'float_percent_down', 'status', 'last_updated', 'created_at', 'updated_at'];
 
     /**
      * 不允许自动填充模型字段
diff --git a/app/common/model/SysDictCategory.php b/app/common/model/SysDictCategory.php
new file mode 100644
index 0000000..fef0219
--- /dev/null
+++ b/app/common/model/SysDictCategory.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class SysDictCategory extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'sys_dict_category';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+    protected $dateFormat = 'U';
+
+    /**
+     * 允许自动填充模型字段
+     */
+    protected $fillable = ['id', 'category_name', 'sort', 'status', 'created_at', 'updated_at'];
+
+    /**
+     * 不允许自动填充模型字段
+     */
+    protected $guarded = [];
+}
\ No newline at end of file
diff --git a/config/route.php b/config/route.php
index c1fcfc1..83c8dd0 100644
--- a/config/route.php
+++ b/config/route.php
@@ -207,6 +207,15 @@ Route::group('/admin', function () {
             Route::any('/update', [app\admin\controller\SysDictItemController::class, 'update']);
             Route::any('/destroy', [app\admin\controller\SysDictItemController::class, 'destroy']);
         });
+
+        // 分类
+        Route::group('/category', function () {
+            Route::any('/list', [app\admin\controller\SysDictCategoryController::class, 'index']);
+            Route::any('/show', [app\admin\controller\SysDictCategoryController::class, 'show']);
+            Route::any('/store', [app\admin\controller\SysDictCategoryController::class, 'store']);
+            Route::any('/update', [app\admin\controller\SysDictCategoryController::class, 'update']);
+            Route::any('/destroy', [app\admin\controller\SysDictCategoryController::class, 'destroy']);
+        });
     });
 
     // 货币