Browse Source

Merge branch 'web_sannong_fr'

15313670163 1 month ago
parent
commit
f89211b07f

+ 3 - 38
app/Controller/WebController.php

@@ -142,43 +142,8 @@ class WebController extends AbstractController
     public function selectWebsiteArea()
     {
         $requireData = $this->request->all();
-       
-        $data=[];
-        if(!empty($requireData)){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'province' => 'required'
-                ],
-                [
-                    'province.required' => '请先选择省份'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data=[
-                'province' => $requireData['province']
-            ];
-            if(isset($requireData['city'])){
-                
-                $data=[
-                    'city' => $requireData['city'],
-                    'province' => $requireData['province']
-                    
-                ];
-                
-                if(isset($requireData['region'])){
-                    $data=[
-                        'province' => $requireData['province'],
-                        'city' => $requireData['city'],
-                        'region' => $requireData['region']
-                    ];
-                }
-            }
-        }
-        $result = $this->websiteServiceClient->selectWebsiteArea($data);
+        // return Result::success($requireData);                          
+        $result = $this->websiteServiceClient->selectWebsiteArea($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
@@ -306,8 +271,8 @@ class WebController extends AbstractController
         }
         $data = [
             'website_id'=>Context::get("SiteId"),
-            'placeid' => $requireData['placeid'],
             'pid' => $requireData['pid'],
+            'placeid' => $requireData['placeid'],
             'num' => $requireData['num']
         ];    
         $result=$this->websiteServiceClient->getWebsiteModelCategory($data);

+ 395 - 233
app/Controller/WebsiteController.php

@@ -1084,239 +1084,7 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->checkWebsiteUrl($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
-    /**
-     * 搜索并获取网站模板信息
-     * @return array
-     */
-    public function getWebsiteTemplateintel()
-
-    {
-        $requireData = $this->request->all();
-        if(isset($requireData['website_name'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'website_name' =>'required'
-                ],
-                [
-                    'website_name.required' => '网站名称不能为空'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-        }
-        if(isset($requireData['status'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'status' =>'required'
-                ],
-                [
-                    'status.required' => '网站应用状态不能为空'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-
-        }
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'page' =>'required',
-                'pageSize' =>'required'
-            ],
-            [
-                'page.required' => '第几页不能为空',
-                'pageSize.required' => '每页显示条数不能为空'
-            ]
-        );
-        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 addWebsiteTemplateintel()
-
-    {
-        $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);
-        }
-        $websiteIdKey = ['website_id' => '']; // 创建一个只包含 website_id 键的数组
-        $diff = array_diff_key($requireData, $websiteIdKey); // 获取 $requireData 中除了 website_id 以外的其他键值对
-        if(!empty($diff)){
-            
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    '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'
-                ],
-                [
-                    '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->addWebsiteTemplateintel($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 getWebsiteTemplateList()
-
-    {
-        $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);
-        }
-            if(isset($requireData['template_class_id'])){
-                $validator = $this->validationFactory->make(
-                    $requireData,
-                    [
-                        'template_class_id' =>'required'
-                    ],
-                    [
-                        'template_class_id.required' => '模板分类id不能为空',
-                    ]
-                );
-                if ($validator->fails()){
-                    $errorMessage = $validator->errors()->first();
-                    return Result::error($errorMessage);
-                }
-            }
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'page_type' =>'required|array|min:2',
-                    'page' =>'required',
-                    'pageSize' =>'required'
-                ],
-                [
-                    'page_type.required' => '页面类型不能为空',
-                    'page_type.array' => '页面类型必须是数组',
-                    'page_type.min' => '页面类型至少有两个元素',
-                    'page.required' => '第几页不能为空',
-                    'pageSize.required' => '每页显示条数不能为空'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-        // var_dump($requireData);
-        $result = $this->websiteServiceClient->getWebsiteTemplateList($requireData);
-        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
-
-    }
-
-    /**
-     * 添加网站模板信息
-     * @return array
-     */
-
-    public function addWebsiteTemplateclassintel()
-
-    {
-        $requireData = $this->request->all();
-        // 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->addWebsiteTemplateclassintel($requireData);
-        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
-        
-    }
+   
      //20250212  网站标识
     public function addWebsiteGroup()
     {
@@ -1589,4 +1357,398 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->upWebsiteCategorySort($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+
+    // --自助建站-----------fr----------------------start
+        /**
+     * 搜索并获取网站模板信息
+     * @return array
+     */
+    public function getWebsiteintel()
+
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required',
+                'pageSize' =>'required'
+            ],
+            [
+                'page.required' => '第几页不能为空',
+                'pageSize.required' => '每页显示条数不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsiteintel($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+
+
+    }
+
+      /**
+     * 添加网站基础信息
+     * @return array
+     */
+
+    public function addWebsiteTemplateintel()
+    {
+        $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);
+        }
+        $websiteIdKey = ['website_id' => '']; // 创建一个只包含 website_id 键的数组
+        $diff = array_diff_key($requireData, $websiteIdKey); // 获取 $requireData 中除了 website_id 以外的其他键值对
+        if(!empty($diff)){
+
+            $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|max:50',
+                    'record_number_url' =>'required|max:100',
+                    'icp_number' =>'required|max:100',
+                    'icp_number_url' =>'required|max:100',
+                    'customer_service_qq' =>'required|max:50',
+                    'communications' =>'required|max:50'
+                ],  
+                [  
+                    '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.max' => '网安备案号不能超过50个字符',
+                    'record_number_url.required' => '网安备案号链接不能为空',
+                    'record_number_url.max' => '网安备案号链接不能超过100个字符',
+                    'icp_number.required' => '网站备案号不能为空',
+                    'icp_number.max' => '网站备案号不能超过100个字符',
+                    'icp_number_url.required' => '网站备案号链接不能为空',
+                    'icp_number_url.max' => '网站备案号链接不能超过100个字符',
+                    'customer_service_qq.required' => '客服qq不能为空',
+                    'customer_service_qq.max' => '客服qq不能超过50个字符',
+                    'communications.required' => '通联qq不能为空',
+                    'communications.max' => '通联qq不能超过50个字符'
+                ]
+            );  
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+
+        }
+        $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,
+             [
+                 'website_id' =>'required'
+             ],
+             [
+                 'website_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|max:50',
+                'record_number_url' =>'required|max:100',
+                'icp_number' =>'required|max:100',
+                'icp_number_url' =>'required|max:100',
+                'customer_service_qq' =>'required|max:50',
+                'communications' =>'required|max:50'
+            ],  
+            [  
+                '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.max' => '网安备案号不能超过50个字符',
+                'record_number_url.required' => '网安备案号链接不能为空',
+                'record_number_url.max' => '网安备案号链接不能超过100个字符',
+                'icp_number.required' => '网站备案号不能为空',
+                'icp_number.max' => '网站备案号不能超过100个字符',
+                'icp_number_url.required' => '网站备案号链接不能为空',
+                'icp_number_url.max' => '网站备案号链接不能超过100个字符',
+                'customer_service_qq.required' => '客服qq不能为空',
+                'customer_service_qq.max' => '客服qq不能超过50个字符',
+                'communications.required' => '通联qq不能为空',
+                'communications.max' => '通联qq不能超过50个字符'
+            ]
+        );
+        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']);
+    }
+
+      /**
+     * 获取所有风格
+     * @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 getWebsiteTemplateList()
+
+    {
+        $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);
+        }
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required',
+                'pageSize' =>'required'
+            ],
+            [
+                'page.required' => '第几页不能为空',
+                'pageSize.required' => '每页显示条数不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // var_dump($requireData);
+        $result = $this->websiteServiceClient->getWebsiteTemplateList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+
+    }
+
+    /**
+     * 添加网站模板信息
+     * @return array
+     */
+
+    public function addWebsiteTemplateclassintel()
+
+    {
+        $requireData = $this->request->all();
+        // 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->addWebsiteTemplateclassintel($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+        
+    }
+    /**
+     * 获取网站模板信息
+     * @return array
+     */
+
+     public function getWebsiteTemplateclassintel()
+
+     {
+         $requireData = $this->request->all();
+         // var_dump($requireData);
+         $validator = $this->validationFactory->make(
+             $requireData,
+             [
+                 'website_id' =>'required',
+                //  'page' =>'required',
+                //  'pageSize' =>'required'
+             ],
+             [
+                 'website_id.required' => '网站id不能为空',
+                //  'page.required' => '第几页不能为空',
+                //  'pageSize.required' => '每页显示条数不能为空'
+             ]
+         );
+         if ($validator->fails()){
+             $errorMessage = $validator->errors()->first();
+             return Result::error($errorMessage);
+         }
+         $data = $requireData;
+         $result = $this->websiteServiceClient->getWebsiteTemplateclassintel($data);
+         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+         
+    }
+    /**
+     * 自助建站-获取职能部门
+     * @return array
+     */
+
+     public function selectWebsiteDepartment()
+
+     {
+        $requireData = $this->request->all();
+         if(isset($requireData['keyword']) && !empty($requireData['keyword'])){
+            $requireData['keyword'] = trim($requireData['keyword']);
+         }else{
+            $requireData['keyword'] = '';
+         }
+         $result = $this->websiteServiceClient->selectWebsiteDepartment($requireData);
+         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+
+    }
+    /**
+     * 自助建站-获取职能部门
+     * @return array
+     */
+
+     public function selectWebsiteArea()
+    {
+        $requireData = $this->request->all();
+        $rules = [
+            // 'website_id' => 'required',
+            'province' => [
+                'nullable',
+                'numeric',
+                function ($attribute, $value, $fail) {
+                    if ($value === 0) {
+                        $fail($attribute . '不能为0');
+                    }
+                },
+            ],
+            'city' => [
+                'nullable',
+                'numeric',
+                function ($attribute, $value, $fail) {
+                    if ($value === 0) {
+                        $fail($attribute . '不能为0');
+                    }
+                },
+            ],
+        ];
+
+        $messages = [
+            // 'website_id.required' => '网站id不能为空',
+            'province.numeric' => '省份必须是数字类型',
+            'province.custom' => '省份不能为0',
+            'city.numeric' => '城市必须是数字类型',
+            'city.custom' => '城市不能为0',
+        ];
+
+        $validator = $this->validationFactory->make($requireData, $rules, $messages);
+       
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage); 
+        }
+            $result = $this->websiteServiceClient->selectWebsiteArea($requireData);
+            return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+
+    }
+    /**
+     * 自助建站-获取模板下的板块
+     * @return array
+     */
+    public function getWebsiteSectorList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required|numeric'
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'website_id.numeric' => '网站id必须是数字类型'
+            ]
+        ); 
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage); 
+        }
+        $result = $this->websiteServiceClient->getWebsiteSectorList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    // --自助建站-----------fr----------------------end
 }

+ 77 - 40
app/JsonRpc/WebsiteService.php

@@ -452,46 +452,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         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 addWebsiteTemplateintel(array $data)
-    {
-        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 getWebsiteTemplateList(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addWebsiteTemplateclassintel(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
+
     
 
 
@@ -608,4 +569,80 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+
+    // --自助建站-----------fr----------------------start
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteintel(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    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
+     */
+    public function getAllTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteTemplateList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteTemplateclassintel(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteTemplateclassintel(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteSectorList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    // --自助建站-----------fr----------------------end
 }

+ 59 - 30
app/JsonRpc/WebsiteServiceInterface.php

@@ -299,36 +299,7 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function checkWebsiteUrl(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function getWebsiteTemplateintel(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function addWebsiteTemplateintel(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function getAllTemplateClass(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function getWebsiteTemplateList(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function addWebsiteTemplateclassintel(array $data);
+
 
     /**
      * @param array $data
@@ -390,4 +361,62 @@ interface WebsiteServiceInterface
      */
     public function upWebsiteCategorySort(array $data);
 
+    
+
+    // --自助建站-----------fr----------------------start
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    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
+    *
+    */
+    public function getAllTemplateClass(array $data);
+     /** 
+    * @param array $data
+    * @return mixed
+    *
+    */
+    public function getWebsiteTemplateList(array $data);
+   /** 
+    * @param array $data
+    * @return mixed
+    *
+    */
+    public function addWebsiteTemplateclassintel(array $data);
+    /** 
+    * @param array $data
+    * @return mixed
+    *
+    */
+    public function getWebsiteTemplateclassintel(array $data);
+    /** 
+    * @param array $data
+    * @return mixed
+    *
+    */
+    public function getWebsiteSectorList(array $data);
+    // --自助建站-----------fr----------------------end
 }

+ 30 - 1
config/api/website.php

@@ -113,7 +113,36 @@ Router::addGroup(
         Router::get('/getAllCategory', [WebsiteController::class, 'getAllCategory']);
         //修改网站导航排序
         Router::post('/upWebsiteCategorySort', [WebsiteController::class, 'upWebsiteCategorySort']);
-
+        // --自助建站-----------fr----------------------start
+        //获取并搜索网站
+        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']);
+        //获取网站选择的模板下的板块
+        Router::post('/getWebsiteSectorList', [WebsiteController::class, 'getWebsiteSectorList']);
+        // --自助建站-----------fr----------------------end
     },
     ['middleware' => [FooMiddleware::class]]
 );
+// --自助建站-----------fr----------------------start
+Router::addGroup(
+    '/website', function () {
+        // 获取职能部门
+        Router::post('/selectWebsiteDepartment', [WebsiteController::class, 'selectWebsiteDepartment']);
+        // 获取行政区划
+        Router::post('/selectWebsiteArea', [WebsiteController::class, 'selectWebsiteArea']);
+    }
+);
+// --自助建站-----------fr----------------------end