Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/FormController.php

@@ -147,4 +147,197 @@ class FormController extends AbstractController
         }
         return Result::success($result['data']);
     }
+    /**
+     * 获取全局表单详情
+     * @return array
+     */
+    public function getGlobalTable(){
+        $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->formServiceClient->getGlobalTable($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 获取表单下面的-字段
+     * @return array
+     */
+    public function getGlobalTableFieldList(){
+
+        $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->formServiceClient->getGlobalTableFieldList($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 添加字段
+     * @return array
+     */
+    public function addGlobalTableField(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'title'=>'required',
+                'field_name'=>'required',
+                'field_type'=>'required',
+                'table_id'=>'required',
+            ],
+            [
+                'title.required' => '显示名称不能为空',
+                'field_name.required' => '字段名称不能为空',
+                'field_type.required' => '字段类型不能为空',
+                'table_id.required' => '表单id不能为空',        
+
+            ]
+            );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);    
+        }
+        $result = $this->formServiceClient->addGlobalTableField($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * upGlobalTableField
+     * @return array
+     */
+    public function upGlobalTableField(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id'=>'required',
+                'title'=>'required',
+                'field_name'=>'required',
+                'field_type'=>'required',
+                'table_id'=>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'title.required' => '显示名称不能为空',
+                'field_name.required' => '字段名称不能为空',        
+                'field_type.required' => '字段类型不能为空',
+            ]
+            );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->formServiceClient->upGlobalTableField($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }   
+        return Result::success($result['data']);
+    }
+    /**
+     * 删除表单字段
+     * @return array
+     */
+    public function delGlobalTableField(){
+        $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->formServiceClient->delGlobalTableField($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+
+    }
+    /**
+     * 获取表单字段详情
+     * @return array    
+     */
+    public function getGlobalTableField(){
+        $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->formServiceClient->getGlobalTableField($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 查看表单下面的数据
+     * getGlobalTableData
+     * @return array
+     */
+    public function getGlobalTableData(){
+        $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->formServiceClient->getGlobalTableData($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+
 }

app/Controller/PublicController.php

@@ -892,7 +892,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 新增板块
+     * 新增通栏
      */
     public function addSector()
     {
@@ -903,19 +903,22 @@ class PublicController extends AbstractController
                 // 'id' => 'required|integer',
                 'template_id'=>'required|integer',
                 'sector_name'=>'required|string',
-                'sector_code'=>'required|string',
-                'page_type'=>'required|integer',
+                'page_type'=>'required',
                 'sector_img'=>'required|string',
+                'size_id'=>'required|integer',
             ],
             [
                 // 'id.required' => 'id 不能为空',
                 // 'id.integer' => 'id 必须是整数',
-                'template_id.required' => '模板id 不能为空',
-                'template_id.integer' => '模板id 必须是整数',
-                'sector_name.required' => '板块名称 不能为空',
-                'sector_name.string' => '板块名称 必须是字符串',
-                'sector_code.required' => '板块代码 不能为空',
-                'sector_code.string' => '板块代码 必须是字符串',
+                'template_id.required' => '皮肤id不能为空',
+                'template_id.integer' => '皮肤id必须是整数',
+                'sector_name.required' => '通栏名称不能为空',
+                'sector_name.string' => '通栏名称必须是字符串',
+                'sector_img.required' => '通栏图片不能为空',
+                'sector_img.string' => '通栏代码必须是字符串',
+                'page_type.required' => '页面类型不能为空',
+                'size_id.required' => '尺寸id不能为空',
+                'size_id.integer' => '尺寸id必须是整数',
             ]
         );
          if ($validator->fails()) {
@@ -927,7 +930,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 获取板块信息
+     * 获取通栏信息
      */
     public function getSectorInfo()
     {
@@ -951,7 +954,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 添加板块
+     * 删除通栏
      */
     public function delSector()
     {
@@ -975,7 +978,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 更新板块
+     * 更新通栏
      */
     public function updateSector()
     {
@@ -999,7 +1002,32 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 获取板块信息列表
+     * 获取所有皮肤
+     */
+    public function getAllTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'template_name' => 'required|string',
+            ],
+            [
+                'template_name.required' => '请输入皮肤名称',
+                'template_name.string' => '请输入字符串',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getAllTemplate($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 获取通栏信息列表
      */
     public function getSectorList(){
         $requireData = $this->request->all();
@@ -1027,7 +1055,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /*
-    * 获取板块列表
+    * 获取通栏列表
     */
     public function getComponentInfo()
     {
@@ -1051,7 +1079,7 @@ class PublicController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 删除板块
+     * 删除通栏
      */
     public function delComponent()
     {

app/Controller/WebsiteController.php

@@ -1801,11 +1801,10 @@ class WebsiteController extends AbstractController
     }
 
     /**
-     * 添加网站基础信息
+     * 自助建站-验证网站搭建
      * @return array
      */
-
-    public function addWebsiteTemplateintel()
+    public function checkWebsiteBuild()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -1821,62 +1820,15 @@ class WebsiteController extends AbstractController
             $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);
+        // $websiteIdKey = ['website_id' => '']; // 创建一个只包含 website_id 键的数组
+        $result = $this->websiteServiceClient->checkWebsiteBuild($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 获取网站基础信息
+     * 自助建站-验证网站编辑
      * @return array
      */
-    public function getWebsiteTemplateintel()
+    public function checkWebsiteEdit()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -1892,7 +1844,7 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->websiteServiceClient->getWebsiteTemplateintel($requireData);
+        $result = $this->websiteServiceClient->checkWebsiteEdit($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**

app/JsonRpc/FormService.php

@@ -61,4 +61,32 @@ class FormService extends AbstractServiceClient implements FormServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getGlobalTableFieldList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addGlobalTableField(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function upGlobalTableField(array $data) 
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function delGlobalTableField(array $data)   
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getGlobalTableField(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getGlobalTableData(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/FormServiceInterface.php

@@ -24,5 +24,29 @@ interface FormServiceInterface
      * @param array $data
      */
     public function delGlobalTable(array $data);
+    /**
+     * @param array $data
+     */
+    public function getGlobalTableFieldList(array $data);
+    /**
+     * @param array $data
+     */
+    public function addGlobalTableField(array $data);
+    /**
+     * @param array $data
+     */
+    public function upGlobalTableField(array $data);
+    /**
+     * @param array $data
+     */
+    public function delGlobalTableField(array $data);
+    /**
+     * @param array $data
+     */
+    public function getGlobalTableField(array $data);
+    /**
+     * @param array $data
+     */
+    public function getGlobalTableData(array $data);
     
 }

app/JsonRpc/PublicRpcService.php

@@ -386,5 +386,11 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
+    /**
+     * 获取所有皮肤
+     */
+    public function getAllTemplate(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -206,6 +206,10 @@ interface PublicRpcServiceInterface
     public function chooseWebsiteTemplate(array $data);
     // 5.保存到草稿箱
     public function saveWebsiteTemplate(array $data);
+    // 6.获取所有皮肤
+    public function getAllTemplate(array $data);
+
+    
 
 
 }

app/JsonRpc/WebsiteService.php

@@ -549,7 +549,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return mixed
      */
-    public function addWebsiteTemplateintel(array $data)
+    public function checkWebsiteBuild(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     } 
@@ -557,7 +557,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return mixed
      */
-    public function getWebsiteTemplateintel(array $data)
+    public function checkWebsiteEdit(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }

app/JsonRpc/WebsiteServiceInterface.php

@@ -353,13 +353,13 @@ interface WebsiteServiceInterface
     * @return mixed
     *
     */
-   public function addWebsiteTemplateintel(array $data);
+   public function checkWebsiteBuild(array $data);
     /**
      * @param array $data
      * @return mixed
      *
      */
-    public function getWebsiteTemplateintel(array $data);
+    public function checkWebsiteEdit(array $data);
     /**
      * @param array $data
      * @return mixed

config/api/form.php

@@ -19,6 +19,19 @@ Router::addGroup(
         Router::get('/getGlobalTableList', [FormController::class, 'getGlobalTableList']);
         //删除全局表单
         Router::post('/delGlobalTable', [FormController::class, 'delGlobalTable']);
+        //getGlobalTableFieldList
+        Router::get('/getGlobalTableFieldList', [FormController::class, 'getGlobalTableFieldList']);
+        //添加全局表单字段
+        Router::post('/addGlobalTableField', [FormController::class, 'addGlobalTableField']);
+        //修改全局表单字段
+        Router::post('/upGlobalTableField', [FormController::class, 'upGlobalTableField']);
+        //删除全局表单字段
+        Router::post('/delGlobalTableField', [FormController::class, 'delGlobalTableField']);
+        //获取全局表单字段详情
+        Router::get('/getGlobalTableField', [FormController::class, 'getGlobalTableField']);
+        //获取表单下面的数据
+        Router::get('/getGlobalTableData', [FormController::class, 'getGlobalTableData']);
+
     },
     ['middleware' => [FooMiddleware::class]]
 );

config/api/public.php

@@ -65,12 +65,13 @@ Router::addGroup(
         Router::post('/delTemplate', [PublicController::class, 'delTemplate']);
         Router::post('/updateTemplate', [PublicController::class, 'updateTemplate']);
 
-        //获取板块
+        //获取通栏
         Router::post('/addSector', [PublicController::class, 'addSector']);
         Router::post('/getSectorList', [PublicController::class, 'getSectorList']);
         Router::post('/delSector', [PublicController::class, 'delSector']);
         Router::post('/updateSector', [PublicController::class, 'updateSector']);
         Router::post('/getSectorInfo', [PublicController::class, 'getSectorInfo']);
+        Router::post('/getAllTemplate', [PublicController::class, 'getAllTemplate']);
         //获取组件
         Router::post('/addComponent', [PublicController::class, 'addComponent']);
         Router::post('/getComponentList', [PublicController::class, 'getComponentList']);

config/api/website.php

@@ -71,10 +71,10 @@ Router::addGroup(
         //检测域名是否被重复解析
         Router::post('/checkWebsiteUrl', [WebsiteController::class, 'checkWebsiteUrl']);
 
-        //获取并搜索网站
-        Router::post('/getWebsiteTemplateintel', [WebsiteController::class, 'getWebsiteTemplateintel']);
-        //搭建网站基础信息
-        Router::post('/addWebsiteTemplateintel', [WebsiteController::class, 'addWebsiteTemplateintel']);
+        //自助建站-验证网站搭建
+        Router::post('/checkWebsiteEdit', [WebsiteController::class, 'checkWebsiteEdit']);
+        //自助建站-验证网站编辑
+        Router::post('/checkWebsiteBuild', [WebsiteController::class, 'checkWebsiteBuild']);
         //获取网站所有风格
         Router::post('/getAllTemplateClass', [WebsiteController::class, 'getAllTemplateClass']);
         //获取网站模板列表