Merge branch '20250522_diywebfr'

app/Controller/WebsiteController.php

@@ -1296,18 +1296,35 @@ class WebsiteController extends AbstractController
     }
 
     /**
-     * 获取模板皮肤分类
+     * 获取风格
      * @return void
      */
     public function getTemplateClass()
     {
         $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required|integer',
+                'pageSize' =>'required|integer',
+            ],
+            [
+                'page.required' => '页码不能为空',
+                'page.integer' => '页码必须为整数',
+                'pageSize.required' => '每页条数不能为空',
+                'pageSize.integer' => '每页条数必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
         $result = $this->websiteServiceClient->getTemplateClass($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
-     * 添加模板分类
+     * 添加风格
      * @return void
      */
     public function addTemplateClass()
@@ -1316,26 +1333,24 @@ class WebsiteController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'name' => 'required'
+                'name' => 'required',
+                'keyword' =>'required',
             ],
             [
-                'name.required' => '模板类型不能为空'
+                'name.required' => '风格名称不能为空',
+                'keyword.required' => '风格关键词不能为空'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data = [
-            'name' => $requireData['name'],
-            'sort' => $requireData['sort'] ?? 0,
-        ];
-        $result = $this->websiteServiceClient->addTemplateClass($data);
+        $result = $this->websiteServiceClient->addTemplateClass($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
-     * 更新模板分类
+     * 更新风格
      * @return array
      */
     public function upTemplateClass()
@@ -1346,27 +1361,24 @@ class WebsiteController extends AbstractController
             [
                 'name' => 'required',
                 'id' => 'required',
+                'keyword' =>'required',
             ],
             [
-                'name.required' => '模板类型不能为空',
-                'name.id' => '模板类型ID不能为空'
+                'name.required' => '风格名称不能为空',
+                'id.required' => '风格ID不能为空',
+                'keyword.required' => '风格关键词不能为空'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data = [
-            'id' => $requireData['id'],
-            'name' => $requireData['name'],
-            'sort' => $requireData['sort'] ?? 0,
-        ];
-        $result = $this->websiteServiceClient->upTemplateClass($data);
+        $result = $this->websiteServiceClient->upTemplateClass($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
-     * 删除模板分类
+     * 删除风格
      * @return array
      */
     public function delTemplateClass()
@@ -1378,17 +1390,14 @@ class WebsiteController extends AbstractController
                 'id' => 'required'
             ],
             [
-                'name.required' => '类型id不能为空'
+                'id.required' => '风格id不能为空'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data = [
-            'id' => $requireData['id']
-        ];
-        $result = $this->websiteServiceClient->delTemplateClass($data);
+        $result = $this->websiteServiceClient->delTemplateClass($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }