From db0892f455644ac564b7365abfa90d890291ad7a Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Thu, 28 Aug 2025 09:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/BrandController.php      | 48 ++++++++++++++++++
 .../controller/BrandSeriesController.php      | 48 ++++++++++++++++++
 app/admin/controller/SysDictController.php    |  7 ++-
 .../controller/SysDictItemController.php      | 31 +++++++++---
 app/admin/logic/BrandLogic.php                | 17 +++++++
 app/admin/logic/BrandSeriesLogic.php          | 17 +++++++
 app/admin/service/BrandSeriesService.php      | 31 ++++++++++++
 app/admin/service/BrandService.php            | 31 ++++++++++++
 app/admin/validate/BrandSeriesValidate.php    | 29 +++++++++++
 app/admin/validate/BrandValidate.php          | 29 +++++++++++
 app/common/model/Brand.php                    | 49 +++++++++++++++++++
 app/common/model/BrandSeries.php              | 49 +++++++++++++++++++
 config/route.php                              | 18 +++++++
 13 files changed, 395 insertions(+), 9 deletions(-)
 create mode 100644 app/admin/controller/BrandController.php
 create mode 100644 app/admin/controller/BrandSeriesController.php
 create mode 100644 app/admin/logic/BrandLogic.php
 create mode 100644 app/admin/logic/BrandSeriesLogic.php
 create mode 100644 app/admin/service/BrandSeriesService.php
 create mode 100644 app/admin/service/BrandService.php
 create mode 100644 app/admin/validate/BrandSeriesValidate.php
 create mode 100644 app/admin/validate/BrandValidate.php
 create mode 100644 app/common/model/Brand.php
 create mode 100644 app/common/model/BrandSeries.php

diff --git a/app/admin/controller/BrandController.php b/app/admin/controller/BrandController.php
new file mode 100644
index 0000000..f917fa5
--- /dev/null
+++ b/app/admin/controller/BrandController.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\BrandService;
+
+class BrandController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new BrandService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @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/BrandSeriesController.php b/app/admin/controller/BrandSeriesController.php
new file mode 100644
index 0000000..c2d95f7
--- /dev/null
+++ b/app/admin/controller/BrandSeriesController.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\BrandSeriesService;
+
+class BrandSeriesController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new BrandSeriesService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @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/SysDictController.php b/app/admin/controller/SysDictController.php
index 4fa9852..0e0b8d7 100644
--- a/app/admin/controller/SysDictController.php
+++ b/app/admin/controller/SysDictController.php
@@ -35,14 +35,19 @@ class SysDictController extends BaseController
 
          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']);
          $data['sysDictItem'] = SysDictItem::where('dict_id',$data['id'])->get();
          return $data;
      }
diff --git a/app/admin/controller/SysDictItemController.php b/app/admin/controller/SysDictItemController.php
index 9c92f6c..9262933 100644
--- a/app/admin/controller/SysDictItemController.php
+++ b/app/admin/controller/SysDictItemController.php
@@ -22,12 +22,27 @@ class SysDictItemController 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/BrandLogic.php b/app/admin/logic/BrandLogic.php
new file mode 100644
index 0000000..6b12364
--- /dev/null
+++ b/app/admin/logic/BrandLogic.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\admin\logic;
+
+use app\common\traits\crud\CrudLogicTrait;
+use app\common\model\Brand;
+
+class BrandLogic
+{
+    use CrudLogicTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = Brand::class;
+
+}
\ No newline at end of file
diff --git a/app/admin/logic/BrandSeriesLogic.php b/app/admin/logic/BrandSeriesLogic.php
new file mode 100644
index 0000000..7400539
--- /dev/null
+++ b/app/admin/logic/BrandSeriesLogic.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\admin\logic;
+
+use app\common\traits\crud\CrudLogicTrait;
+use app\common\model\BrandSeries;
+
+class BrandSeriesLogic
+{
+    use CrudLogicTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = BrandSeries::class;
+
+}
\ No newline at end of file
diff --git a/app/admin/service/BrandSeriesService.php b/app/admin/service/BrandSeriesService.php
new file mode 100644
index 0000000..8697450
--- /dev/null
+++ b/app/admin/service/BrandSeriesService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace app\admin\service;
+
+use app\admin\validate\BrandSeriesValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\BrandSeries;
+
+class BrandSeriesService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = BrandSeries::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = BrandSeriesValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return  new $this->validator;
+    }
+}
\ No newline at end of file
diff --git a/app/admin/service/BrandService.php b/app/admin/service/BrandService.php
new file mode 100644
index 0000000..83af709
--- /dev/null
+++ b/app/admin/service/BrandService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace app\admin\service;
+
+use app\admin\validate\BrandValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\Brand;
+
+class BrandService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = Brand::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = BrandValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return  new $this->validator;
+    }
+}
\ No newline at end of file
diff --git a/app/admin/validate/BrandSeriesValidate.php b/app/admin/validate/BrandSeriesValidate.php
new file mode 100644
index 0000000..31e30e2
--- /dev/null
+++ b/app/admin/validate/BrandSeriesValidate.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class BrandSeriesValidate extends Validate
+{
+    // 规则
+    protected $rule = [
+        
+    ];
+
+    // 提示
+    protected $message = [
+        
+    ];
+
+    // 场景
+    protected $scene = [
+        'store' => [
+            
+        ],
+
+        'update' => [
+            
+        ]
+    ];
+}
\ No newline at end of file
diff --git a/app/admin/validate/BrandValidate.php b/app/admin/validate/BrandValidate.php
new file mode 100644
index 0000000..370728d
--- /dev/null
+++ b/app/admin/validate/BrandValidate.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class BrandValidate extends Validate
+{
+    // 规则
+    protected $rule = [
+        
+    ];
+
+    // 提示
+    protected $message = [
+        
+    ];
+
+    // 场景
+    protected $scene = [
+        'store' => [
+            
+        ],
+
+        'update' => [
+            
+        ]
+    ];
+}
\ No newline at end of file
diff --git a/app/common/model/Brand.php b/app/common/model/Brand.php
new file mode 100644
index 0000000..22c4704
--- /dev/null
+++ b/app/common/model/Brand.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class Brand extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'brand';
+
+    /**
+     * 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', 'brand_code', 'brand_name', 'logo', 'country', 'description', 'status', 'sort', 'created_at', 'updated_at'];
+
+    /**
+     * 不允许自动填充模型字段
+     */
+    protected $guarded = [];
+}
\ No newline at end of file
diff --git a/app/common/model/BrandSeries.php b/app/common/model/BrandSeries.php
new file mode 100644
index 0000000..ee34460
--- /dev/null
+++ b/app/common/model/BrandSeries.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class BrandSeries extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'brand_series';
+
+    /**
+     * 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', 'brand_id', 'series_code', 'series_name', 'description', '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 a6eee63..12e444f 100644
--- a/config/route.php
+++ b/config/route.php
@@ -208,6 +208,24 @@ Route::group('/admin', function () {
         Route::any('/update', [app\admin\controller\SysCurrencyController::class, 'update']);
         Route::any('/destroy', [app\admin\controller\SysCurrencyController::class, 'destroy']);
     });
+
+    // 品牌
+    Route::group('/brand', function () {
+        Route::any('/list', [app\admin\controller\BrandController::class, 'index']);
+        Route::any('/show', [app\admin\controller\BrandController::class, 'show']);
+        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('/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']);
+    });
 });