Merge branch '20241216_fr_diyweb' into dev

app/Controller/FooterController.php

@@ -287,7 +287,7 @@ class FooterController extends AbstractController
                 'pageSize' =>'required'
             ],
             [
-                'fcat_id.required' => '底部导航类型不能为空',
+                'fcat_id.required' => '底部导航id不能为空',
                 'page.required' => '第几页不能为空',
                 'pageSize.required' => '每页显示数量不能为空'
             ]
@@ -296,8 +296,8 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(isset($requireData['con_title'])){
 
+        if(isset($requireData['list_title'])){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
@@ -308,6 +308,22 @@ class FooterController extends AbstractController
                 ]
             );
             
+            if($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['list_title'] = $requireData['list_title'];
+        }
+        if(isset($requireData['con_title'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'con_title' =>'required'
+                ],
+                [
+                    'con_title.required' => '内容标题不能为空'
+                ]
+            );
             if($validator->fails()){
                 $errorMessage = $validator->errors()->first();
                 return Result::error($errorMessage);

app/Controller/PublicController.php

@@ -800,7 +800,7 @@ class PublicController extends AbstractController
                 'template_id'=>'required|integer',
                 'sector_name'=>'required|string',
                 'sector_code'=>'required|string',
-                'page_type'=>'required|integer',
+                'page_type'=>'required|string',
                 'sector_img'=>'required|string',
             ],
             [
@@ -812,6 +812,10 @@ class PublicController extends AbstractController
                 'sector_name.string' => '板块名称 必须是字符串',
                 'sector_code.required' => '板块代码 不能为空',
                 'sector_code.string' => '板块代码 必须是字符串',
+                'page_type.required' => '页面类型 不能为空',
+                'page_type.string' => '页面类型 必须是字符串',
+                'sector_img.required' => '板块图片 不能为空',
+                'sector_img.string' => '板块图片 必须是字符串',
             ]
         );
          if ($validator->fails()) {

app/Controller/WebsiteController.php

@@ -1103,8 +1103,8 @@ class WebsiteController extends AbstractController
      * 搜索并获取网站模板信息
      * @return array
      */
-
-    public function getWebsiteTemplateintel(){
+ 
+    public function getWebsiteintel(){  //getWebsiteTemplateintel
         $requireData = $this->request->all();
         if(isset($requireData['website_name'])){
             $validator = $this->validationFactory->make(
@@ -1152,7 +1152,7 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->websiteServiceClient->getWebsiteTemplateintel($requireData);
+        $result = $this->websiteServiceClient->getWebsiteintel($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
 
     }
@@ -1209,7 +1209,6 @@ class WebsiteController extends AbstractController
         $websiteIdKey = ['website_id' => '']; // 创建一个只包含 website_id 键的数组
         $diff = array_diff_key($requireData, $websiteIdKey); // 获取 $requireData 中除了 website_id 以外的其他键值对
         if(!empty($diff)){
-            
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
@@ -1249,6 +1248,80 @@ class WebsiteController extends AbstractController
 
         $result = $this->websiteServiceClient->addWebsiteTemplateintel($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+     /**
+     * 获取网站基础信息
+     * @return array
+     */
+     public function getWebsiteTemplateintel()
+     {
+         $requireData = $this->request->all();
+         $validator = $this->validationFactory->make(
+             $requireData,
+             [
+                 'id' =>'required'
+             ],
+             [
+                 'id.required' => '搭建网站id不能为空',
+             ]
+         );
+         if ($validator->fails()){
+             $errorMessage = $validator->errors()->first();
+             return Result::error($errorMessage);
+         }
+         $result = $this->websiteServiceClient->getWebsiteTemplateintel($requireData);
+         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+ 
+     }
+      /**
+     * 修改网站基础信息
+     * @return array
+     */
+
+    public function upWebsiteTemplateintel()
+
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required',
+                'page_type' =>'required|array|min:2',
+                'statement' =>'required',
+                'organizer' =>'required',
+                'copyright_information' =>'required',
+                'project_logo' =>'required',
+                'record_number' =>'required',
+                'record_number_url' =>'required',
+                'icp_number' =>'required',
+                'icp_number_url' =>'required',
+                'customer_service_qq' =>'required',
+                'communications' =>'required'
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'page_type.required' => '页面类型不能为空',
+                'page_type.array' => '页面类型必须是数组',
+                'page_type.min' => '页面类型至少有两个元素',
+                'statement.required' => '网站声明不能为空',
+                'organizer.required' => '主办单位不能为空',
+                'copyright_information.required' => '版权信息不能为空',
+                'project_logo.required' => '项目logo不能为空',
+                'record_number.required' => '网安备案号不能为空',
+                'record_number_url.required' => '网安备案号链接不能为空',
+                'icp_number.required' => '网站备案号不能为空',
+                'icp_number_url.required' => '网站备案号链接不能为空',
+                'customer_service_qq.required' => '客服qq不能为空',
+                'communications.required' => '通联qq不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->upWebsiteTemplateintel($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+
     }
 
     /**
@@ -1412,7 +1485,7 @@ class WebsiteController extends AbstractController
                 'website_id' =>'required'
             ],
             [
-                'template_id.required' => '模板分类id不能为空',
+                'template_id.required' => '模板id不能为空',
                 'website_id.required' => '网站id不能为空'
             ]
         );
@@ -1420,7 +1493,6 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-      
         $result = $this->websiteServiceClient->addWebsiteTemplateclassintel($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
         
@@ -1443,19 +1515,34 @@ class WebsiteController extends AbstractController
             return Result::error($result['message']);
         }
     }
-
     /**
-     * 获取网站导航池
+     * 获取网站模板信息
      * @return array
      */
-    public function getSiteCategory()
-    {
-
-        $requireData['website_id'] = Context::get("SiteId");
-        $result = $this->websiteServiceClient->getAdminWebsiteCategory($requireData);
-        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
-    }
 
+     public function getWebsiteTemplateclassintel()
+
+     {
+         $requireData = $this->request->all();
+         // var_dump($requireData);
+         $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->getWebsiteTemplateclassintel($requireData);
+         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+        
+     }
+      
     /**
      * 获取底部导航
      * @return array

app/JsonRpc/WebsiteService.php

@@ -473,7 +473,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return mixed
      */
-    public function getWebsiteTemplateintel(array $data)
+    public function getWebsiteintel(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
@@ -484,7 +484,23 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     public function addWebsiteTemplateintel(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
-    }    
+    } 
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteTemplateintel(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWebsiteTemplateintel(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }   
     /**
      * @param array $data
      * @return mixed
@@ -563,5 +579,12 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteTemplateclassintel(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -298,13 +298,25 @@ interface WebsiteServiceInterface
      * @return mixed
      *
      */
-    public function getWebsiteTemplateintel(array $data);
+    public function getWebsiteintel(array $data);
     /** 
     * @param array $data
     * @return mixed
     *
     */
    public function addWebsiteTemplateintel(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function getWebsiteTemplateintel(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function upWebsiteTemplateintel(array $data);
     /** 
     * @param array $data
     * @return mixed
@@ -323,7 +335,12 @@ interface WebsiteServiceInterface
     *
     */
     public function addWebsiteTemplateclassintel(array $data);
-    
+    /** 
+    * @param array $data
+    * @return mixed
+    *
+    */
+    public function getWebsiteTemplateclassintel(array $data);
 
     /**
      * @param array $data

config/api/website.php

@@ -92,15 +92,21 @@ Router::addGroup(
 
 
         //获取并搜索网站
-        Router::post('/getWebsiteTemplateintel', [WebsiteController::class, 'getWebsiteTemplateintel']);
-        //搭建网站基础信息
+        Router::post('/getWebsiteintel', [WebsiteController::class, 'getWebsiteintel']);
+        //添加搭建网站基础信息
         Router::post('/addWebsiteTemplateintel', [WebsiteController::class, 'addWebsiteTemplateintel']);
-        //获取网站所有风格
+         //获取搭建网站基础信息
+         Router::post('/getWebsiteTemplateintel', [WebsiteController::class, 'getWebsiteTemplateintel']);
+         //修改搭建网站基础信息
+         Router::post('/upWebsiteTemplateintel', [WebsiteController::class, 'upWebsiteTemplateintel']);
+         //获取网站所有风格
         Router::post('/getAllTemplateClass', [WebsiteController::class, 'getAllTemplateClass']);
         //获取网站模板列表
         Router::post('/getWebsiteTemplateList', [WebsiteController::class, 'getWebsiteTemplateList']);
         //添加网站选择风格
         Router::post('/addWebsiteTemplateclassintel', [WebsiteController::class, 'addWebsiteTemplateclassintel']);
+         //获取网站选择风格
+         Router::post('/getWebsiteTemplateclassintel', [WebsiteController::class, 'getWebsiteTemplateclassintel']);
     },
     ['middleware' => [FooMiddleware::class]]
 );