From 149909dd0987ec65722a06a555b05282f7952eab Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Thu, 28 Aug 2025 11:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/BrandController.php    |  5 +++
 app/admin/controller/VehColorController.php | 33 ++++++++++++++
 app/admin/logic/VehColorLogic.php           | 17 +++++++
 app/admin/service/VehColorService.php       | 31 +++++++++++++
 app/admin/validate/VehColorValidate.php     | 29 ++++++++++++
 app/common/model/VehColor.php               | 49 +++++++++++++++++++++
 config/route.php                            | 23 +++++++---
 7 files changed, 180 insertions(+), 7 deletions(-)
 create mode 100644 app/admin/controller/VehColorController.php
 create mode 100644 app/admin/logic/VehColorLogic.php
 create mode 100644 app/admin/service/VehColorService.php
 create mode 100644 app/admin/validate/VehColorValidate.php
 create mode 100644 app/common/model/VehColor.php

diff --git a/app/admin/controller/BrandController.php b/app/admin/controller/BrandController.php
index f917fa5..a265207 100644
--- a/app/admin/controller/BrandController.php
+++ b/app/admin/controller/BrandController.php
@@ -2,6 +2,7 @@
 namespace app\admin\controller;
 
 use app\common\controller\BaseController;
+use app\common\service\OssService;
 use app\common\traits\crud\CrudControllerTrait;
 use app\admin\service\BrandService;
 
@@ -28,6 +29,8 @@ class BrandController extends BaseController
              $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']);
+         if (empty($data['logo']))
+             $data['logo_full'] = (new OssService)->generatePrivateUrl($data['logo']);
          return $data;
      }
 
@@ -43,6 +46,8 @@ class BrandController extends BaseController
             $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']);
+        if (empty($data['logo']))
+            $data['logo_full'] = (new OssService)->generatePrivateUrl($data['logo']);
         return $data;
     }
 }
\ No newline at end of file
diff --git a/app/admin/controller/VehColorController.php b/app/admin/controller/VehColorController.php
new file mode 100644
index 0000000..0d208ae
--- /dev/null
+++ b/app/admin/controller/VehColorController.php
@@ -0,0 +1,33 @@
+<?php
+namespace app\admin\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\admin\service\VehColorService;
+
+class VehColorController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new VehColorService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @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;
+    // }
+}
\ No newline at end of file
diff --git a/app/admin/logic/VehColorLogic.php b/app/admin/logic/VehColorLogic.php
new file mode 100644
index 0000000..484ba21
--- /dev/null
+++ b/app/admin/logic/VehColorLogic.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\admin\logic;
+
+use app\common\traits\crud\CrudLogicTrait;
+use app\common\model\VehColor;
+
+class VehColorLogic
+{
+    use CrudLogicTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = VehColor::class;
+
+}
\ No newline at end of file
diff --git a/app/admin/service/VehColorService.php b/app/admin/service/VehColorService.php
new file mode 100644
index 0000000..a701ef4
--- /dev/null
+++ b/app/admin/service/VehColorService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace app\admin\service;
+
+use app\admin\validate\VehColorValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\VehColor;
+
+class VehColorService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = VehColor::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = VehColorValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return  new $this->validator;
+    }
+}
\ No newline at end of file
diff --git a/app/admin/validate/VehColorValidate.php b/app/admin/validate/VehColorValidate.php
new file mode 100644
index 0000000..1c619ec
--- /dev/null
+++ b/app/admin/validate/VehColorValidate.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class VehColorValidate extends Validate
+{
+    // 规则
+    protected $rule = [
+        
+    ];
+
+    // 提示
+    protected $message = [
+        
+    ];
+
+    // 场景
+    protected $scene = [
+        'store' => [
+            
+        ],
+
+        'update' => [
+            
+        ]
+    ];
+}
\ No newline at end of file
diff --git a/app/common/model/VehColor.php b/app/common/model/VehColor.php
new file mode 100644
index 0000000..9554aa5
--- /dev/null
+++ b/app/common/model/VehColor.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class VehColor extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'veh_color';
+
+    /**
+     * 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', 'color_code', 'color_text', 'type', 'hex_code', 'rgb_code', 'status', 'sort', 'created_at', 'updated_at'];
+
+    /**
+     * 不允许自动填充模型字段
+     */
+    protected $guarded = [];
+}
\ No newline at end of file
diff --git a/config/route.php b/config/route.php
index 12e444f..ae5c22d 100644
--- a/config/route.php
+++ b/config/route.php
@@ -216,16 +216,25 @@ Route::group('/admin', function () {
         Route::any('/store', [app\admin\controller\BrandController::class, 'store']);
         Route::any('/update', [app\admin\controller\BrandController::class, 'update']);
         Route::any('/destroy', [app\admin\controller\BrandController::class, 'destroy']);
+        // 车系
+        Route::group('/series', function () {
+            Route::any('/list', [app\admin\controller\BrandSeriesController::class, 'index']);
+            Route::any('/show', [app\admin\controller\BrandSeriesController::class, 'show']);
+            Route::any('/store', [app\admin\controller\BrandSeriesController::class, 'store']);
+            Route::any('/update', [app\admin\controller\BrandSeriesController::class, 'update']);
+            Route::any('/destroy', [app\admin\controller\BrandSeriesController::class, 'destroy']);
+        });
     });
 
-    // 品牌
-    Route::group('/brand/series', function () {
-        Route::any('/list', [app\admin\controller\BrandSeriesController::class, 'index']);
-        Route::any('/show', [app\admin\controller\BrandSeriesController::class, 'show']);
-        Route::any('/store', [app\admin\controller\BrandSeriesController::class, 'store']);
-        Route::any('/update', [app\admin\controller\BrandSeriesController::class, 'update']);
-        Route::any('/destroy', [app\admin\controller\BrandSeriesController::class, 'destroy']);
+    // 汽车颜色
+    Route::group('/color', function () {
+        Route::any('/list', [app\admin\controller\VehColorController::class, 'index']);
+        Route::any('/show', [app\admin\controller\VehColorController::class, 'show']);
+        Route::any('/store', [app\admin\controller\VehColorController::class, 'store']);
+        Route::any('/update', [app\admin\controller\VehColorController::class, 'update']);
+        Route::any('/destroy', [app\admin\controller\VehColorController::class, 'destroy']);
     });
+
 });