解决方法重名问题及拆分获取网站模板、添加网站模板

app/Controller/AbstractController.php

@@ -29,7 +29,7 @@ abstract class AbstractController
 
     #[Inject]
     protected ResponseInterface $response;
-
+    
     
     /**
      * @var LoggerInterface

app/Controller/WebsiteController.php

@@ -1187,12 +1187,22 @@ class WebsiteController extends AbstractController
         }
         $result = $this->websiteServiceClient->addWebsiteTemplateinfo($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+      /**
+     * 获取所有风格
+     * @return array
+     */
+    public function getAllTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $result = $this->websiteServiceClient->getAllTemplateClass($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
     /**
-     * 添加网站模板信息
+     * 获取网站模板信息
      * @return array
      */
-    public function addWebsiteTemplate()
+    public function getWebsiteTemplateList()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -1208,21 +1218,6 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(isset($requireData['template_id'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'template_id' =>'required'
-                ],
-                [
-                    'template_id.required' => '模板id不能为空'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-        }else{
             if(isset($requireData['template_class_id'])){
                 $validator = $this->validationFactory->make(
                     $requireData,
@@ -1257,19 +1252,36 @@ class WebsiteController extends AbstractController
                 $errorMessage = $validator->errors()->first();
                 return Result::error($errorMessage);
             }
-        }
         // var_dump($requireData);
-        $result = $this->websiteServiceClient->addWebsiteTemplate($requireData);
+        $result = $this->websiteServiceClient->getWebsiteTemplateList($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
-     /**
+    /**
      * 添加网站模板信息
      * @return array
      */
-    public function getAllTemplateClass()
+    public function addWebsiteTemplateclassinfo()
     {
         $requireData = $this->request->all();
-        $result = $this->websiteServiceClient->getAllTemplateClass($requireData);
+        var_dump($requireData);
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'template_id' =>'required',
+                'website_id' =>'required'
+            ],
+            [
+                'template_id.required' => '模板分类id不能为空',
+                'website_id.required' => '网站id不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+      
+        $result = $this->websiteServiceClient->addWebsiteTemplateclassinfo($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+   
 }

app/JsonRpc/WebsiteService.php

@@ -464,20 +464,29 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }    
+    /**
+     *@param array $data
+     * @return mixed
+     */
+    public function getAllTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed
      */
-    public function addWebsiteTemplate(array $data)
+    public function getWebsiteTemplateList(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
     /**
-     *@param array $data
+     * @param array $data
      * @return mixed
      */
-    public function getAllTemplateClass(array $data)
+    public function addWebsiteTemplateclassinfo(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -317,18 +317,24 @@ interface WebsiteServiceInterface
     *
     */
    public function addWebsiteTemplateinfo(array $data);
-
-   /** 
+    /** 
     * @param array $data
     * @return mixed
     *
     */
-    public function addWebsiteTemplate(array $data);
+    public function getAllTemplateClass(array $data);
      /** 
     * @param array $data
     * @return mixed
     *
     */
-    public function getAllTemplateClass(array $data);
+    public function getWebsiteTemplateList(array $data);
+   /** 
+    * @param array $data
+    * @return mixed
+    *
+    */
+    public function addWebsiteTemplateclassinfo(array $data);
+    
 
 }

config/api/website.php

@@ -86,8 +86,10 @@ Router::addGroup(
         Router::post('/addWebsiteTemplateinfo', [WebsiteController::class, 'addWebsiteTemplateinfo']);
         //获取网站所有风格
         Router::post('/getAllTemplateClass', [WebsiteController::class, 'getAllTemplateClass']);
+        //获取网站模板列表
+        Router::post('/getWebsiteTemplateList', [WebsiteController::class, 'getWebsiteTemplateList']);
         //添加网站选择风格
-        Router::post('/addWebsiteTemplate', [WebsiteController::class, 'addWebsiteTemplate']);
+        Router::post('/addWebsiteTemplateclassinfo', [WebsiteController::class, 'addWebsiteTemplateclassinfo']);
     },
     ['middleware' => [FooMiddleware::class]]
 );