rkljw 4 miesięcy temu
rodzic
commit
f65ff7646a

+ 60 - 2
app/Controller/WebsiteController.php

@@ -1070,12 +1070,12 @@ class WebsiteController extends AbstractController
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
+
     /**
      * 风格板块列表
      * @return array
      */
-    public function templateSectorList()
-    {
+    public function templateSectorList(){
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
@@ -1090,6 +1090,7 @@ class WebsiteController extends AbstractController
                 'template_id.required' => '风格id不能为空',
                 'page.required' => '页码不能为空',
                 'pageSize.required' => '每页显示条数不能为空',
+
             ]
         );
         if ($validator->fails()){
@@ -1106,6 +1107,7 @@ class WebsiteController extends AbstractController
      * @return array
      */
     public function sectorComponentList()
+
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -1121,6 +1123,7 @@ class WebsiteController extends AbstractController
                 'template_id.required' => '风格id不能为空',
                 'page.required' => '页码不能为空',
                 'pageSize.required' => '每页显示条数不能为空',
+
             ]
         );
         if ($validator->fails()){
@@ -1151,6 +1154,61 @@ class WebsiteController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->websiteServiceClient->getWebsiteTemplateInfo($requireData);
+//        var_dump("返回数据:",$result['data']['template_data']);
+        if($result['data'] && $result['data']['template_data']){
+            $result['data']['template_data'] = json_decode($result['data']['template_data'],true);
+        }
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 保存模板数据
+     * @return array
+     */
+    public function addWebsiteTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+                'template_data' => 'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'template_data.required' => '模板数据不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+//        $requireData = json_decode($requireData['template_data']);
+        $result = $this->websiteServiceClient->addWebsiteTemplate($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 获取模板的数据
+     * @return array
+     */
+    public function getWebsiteTemplateData()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsiteTemplateData($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 

+ 19 - 2
app/JsonRpc/WebsiteService.php

@@ -462,7 +462,15 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return mixed
      */
-    public function sectorComponentList(array $data)
+    public function sectorComponentList(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function addWebsiteTemplate(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
@@ -471,7 +479,16 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return array|mixed
      */
-    public function getWebsiteTemplateInfo(array $data)
+
+    public function getWebsiteTemplateInfo(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getWebsiteTemplateData(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }

+ 14 - 0
app/JsonRpc/WebsiteServiceInterface.php

@@ -316,6 +316,13 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return mixed
      */
+    public function addWebsiteTemplate(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+
     public function sectorComponentList(array $data);
 
     /**
@@ -324,4 +331,11 @@ interface WebsiteServiceInterface
      */
     public function getWebsiteTemplateInfo(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteTemplateData(array $data);
+
+
 }

+ 7 - 1
config/api/website.php

@@ -85,8 +85,14 @@ Router::addGroup(
         Router::get('/sectorComponentList', [WebsiteController::class, 'sectorComponentList']);
         //获取网站模板信息
         Router::get('/getWebsiteTemplateInfo', [WebsiteController::class, 'getWebsiteTemplateInfo']);
-
+        //模板保存
+        Router::post('/addWebsiteTemplate', [WebsiteController::class, 'addWebsiteTemplate']);
+        //获取模板的数据
+        Router::get('/getWebsiteTemplateData', [WebsiteController::class, 'getWebsiteTemplateData']);
 
     },
     ['middleware' => [FooMiddleware::class]]
 );
+
+
+