|
@@ -1069,10 +1069,6 @@ class WebsiteController extends AbstractController
|
|
|
$result = $this->websiteServiceClient->checkWebsiteUrl($requireData);
|
|
|
return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
-
|
|
|
-=======
|
|
|
->>>>>>> 20241216_fr_diyweb
|
|
|
/**
|
|
|
* 风格板块列表
|
|
|
* @return array
|
|
@@ -1103,7 +1099,62 @@ class WebsiteController extends AbstractController
|
|
|
$result = $this->websiteServiceClient->templateSectorList($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']);
|
|
|
+
|
|
|
}
|
|
|
/**
|
|
|
*
|
|
@@ -1135,8 +1186,67 @@ class WebsiteController extends AbstractController
|
|
|
$result = $this->websiteServiceClient->sectorComponentList($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']);
|
|
|
}
|
|
@@ -1168,8 +1278,17 @@ class WebsiteController extends AbstractController
|
|
|
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']);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
/**
|
|
|
* 保存模板数据
|
|
@@ -1198,7 +1317,65 @@ class WebsiteController extends AbstractController
|
|
|
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']);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
/**
|
|
|
* 获取模板的数据
|
|
@@ -1224,7 +1401,34 @@ class WebsiteController extends AbstractController
|
|
|
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']);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
/**
|
|
|
* 获取站点信息
|