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

app/Controller/FormController.php

@@ -339,5 +339,98 @@ class FormController extends AbstractController
         }
         return Result::success($result['data']);
     }
+    /**
+     * 字段类型列表
+     * @return array
+     */
+    public function getGlobalTableFieldTypeList(){
+        $result = $this->formServiceClient->getGlobalTableFieldTypeList([]);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+
+    /**
+     * 删除表单下面的数据
+     * @return array
+     */
+    public function delGlobalTableData(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id'=>'required',
+                'table_id'=>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'table_id.required' => '表单id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->formServiceClient->delGlobalTableData($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
 
+    /**
+     * @return array
+     */
+    public function getGlobalTableDataById(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id'=>'required',
+                'table_id'=>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'table_id.required' => '表单id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->formServiceClient->getGlobalTableDataById($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+
+    /**
+     * 更新表单下面的数据
+     * @return array
+     */
+    public function updateGlobalTableData(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id'=>'required',
+                'table_id'=>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'table_id.required' => '表单id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->formServiceClient->updateGlobalTableData($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
 }

app/Controller/PublicController.php

@@ -1697,10 +1697,12 @@ class PublicController extends AbstractController
             [
                 'website_id' =>'required',
                 'template_data' =>'required',
+                'canvas_data' =>'required',
             ],
             [
                 'website_id.required' => '网站名称不能为空',
                 'template_data.required' => '网站名称不能为空',
+                'canvas_data.required' => 'canvas_data不能为空',
             ]
         );
          if ($validator->fails()) {
@@ -1711,6 +1713,31 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->saveWebsiteTemplate($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 自助建站-6.返显保存的模版
+     * @return array
+     */
+    public function getWebsiteTemplate()
+    {
+        $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);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getWebsiteTemplate($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+
     /**
      * 获取企业列表
      * @return array

app/Controller/WebController.php

@@ -1350,4 +1350,96 @@ class WebController extends AbstractController
         $result = $this->newsServiceClient->getWebsiteNwHomeList($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+    /**
+     * c端-企业 模块企业
+     * @return array
+     */
+    public function getWebsiteCompany(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'level' => 'nullable|integer',
+                'category_id' => 'nullable|integer',
+                'imgnum' => 'required|integer',
+                'textnum' => 'required|integer',
+                // 自定义验证规则，确保 level 和 category_id 只有一个能为空
+                'level_or_category_id' => 'required_without_all:level,category_id|in:1',
+            ],
+            [
+                'level.integer' => '推荐等级必须为整数',
+                'category_id.integer' => '栏目 ID 必须为整数',
+                'imgnum.required' => '图片新闻条数不能为空',
+                'imgnum.integer' => '图片新闻条数必须为整数',
+                'textnum.required' => '文字新闻条数不能为空',
+                'textnum.integer' => '文字新闻条数必须为整数',
+                'level_or_category_id.required_without_all' => '推荐等级和栏目 ID 不能同时为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId")?? 0;
+        $result = $this->newsServiceClient->getWebsiteCompany($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /*
+    *c端-企业 企业列表
+    * @return array
+    */
+    public function getWebsiteCompanyList(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'keyword' =>'nullable|string',
+                'category_id' =>'nullable|integer',
+                'page' => 'required|integer',
+                'pageSize' =>'required|integer',
+                // 自定义验证规则，确保 level 和 category_id 只有一个能为空
+                'keyword_or_category_id' => 'required_without_all:keyword,category_id|in:1',
+            ],
+            [
+                'category_id.interger' => '栏目id必须为整数',   
+                'keyword.string' => '搜索关键字必须为字符串',
+                'page.required' => '当前页不能为空',
+                'page.integer' => '当前页必须为整数',
+                'pageSize.required' => '每页数量不能为空',
+                'pageSize.integer' => '每页数量必须为整数',
+                'keyword_or_category_id.required_without_all' => '搜索关键字和栏目 ID 不能同时为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId")?? 0;
+        $result = $this->newsServiceClient->getWebsiteCompanyList($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+    *c端-企业 企业详情
+    * @return array
+    */
+    public function getWebsiteCompanyInfo(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer',
+            ],
+            [
+                'id.required' => 'company_id不能为空',
+                'id.integer' => 'company_id必须为整数',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId")?? 0;
+        $result = $this->newsServiceClient->getWebsiteCompanyInfo($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/Controller/WebsiteController.php

@@ -2733,4 +2733,30 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->upStaticResource($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+
+    /**
+     * 更新网站状态
+     * @return array
+     */
+    public function updateWebsiteStatus()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+                'status' =>'required',
+            ],
+            [
+                'id.required' => '网站id不能为空',
+                'status.required' => '网站状态不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->updateWebsiteStatus($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }

app/JsonRpc/FooterService.php

@@ -90,4 +90,5 @@ class FooterService extends AbstractServiceClient implements FooterServiceInterf
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
 }

app/JsonRpc/FormService.php

@@ -89,4 +89,20 @@ class FormService extends AbstractServiceClient implements FormServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getGlobalTableFieldTypeList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function delGlobalTableData(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getGlobalTableDataById(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateGlobalTableData(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/FormServiceInterface.php

@@ -48,5 +48,27 @@ interface FormServiceInterface
      * @param array $data
      */
     public function getGlobalTableData(array $data);
-    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getGlobalTableFieldTypeList(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delGlobalTableData(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getGlobalTableDataById(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function updateGlobalTableData(array $data);
 }

app/JsonRpc/NewsService.php

@@ -527,6 +527,30 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCompany(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCompanyInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCompanyList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed

app/JsonRpc/NewsServiceInterface.php

@@ -390,6 +390,22 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getWebsiteLevelJob(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCompany(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCompanyInfo(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCompanyList(array $data);
+    
 
     /**
      * @param array $data

app/JsonRpc/PublicRpcService.php

@@ -393,4 +393,11 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 自助建站-6.返显保存的模版
+     */
+    public function getWebsiteTemplate(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -206,8 +206,10 @@ interface PublicRpcServiceInterface
     public function chooseWebsiteTemplate(array $data);
     // 5.保存到草稿箱
     public function saveWebsiteTemplate(array $data);
-    // 6.获取所有皮肤
+    // 通栏管理-获取所有皮肤
     public function getAllTemplate(array $data);
+    // 7.返显保存的模版
+    public function getWebsiteTemplate(array $data);
 
     
 

app/JsonRpc/WebsiteService.php

@@ -829,4 +829,8 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function updateWebsiteStatus(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -518,5 +518,11 @@ interface WebsiteServiceInterface
      */
     public function cloneWebsite(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function updateWebsiteStatus(array $data);
+
 
 }

config/api/form.php

@@ -31,6 +31,14 @@ Router::addGroup(
         Router::get('/getGlobalTableField', [FormController::class, 'getGlobalTableField']);
         //获取表单下面的数据
         Router::get('/getGlobalTableData', [FormController::class, 'getGlobalTableData']);
+        //获取表单字段类型列表
+        Router::get('/getGlobalTableFieldTypeList', [FormController::class, 'getGlobalTableFieldTypeList']);
+        //删除表单下面的数据
+        Router::post('/delGlobalTableData', [FormController::class, 'delGlobalTableData']);
+        //获取表单下面的数据详情
+        Router::get('/getGlobalTableDataById', [FormController::class, 'getGlobalTableDataById']);
+        //修改表单下面的数据
+        Router::post('/updateGlobalTableData', [FormController::class, 'updateGlobalTableData']);
 
     },
     ['middleware' => [FooMiddleware::class]]

config/api/public.php

@@ -100,6 +100,8 @@ Router::addGroup(
         Router::post('/chooseWebsiteTemplate', [PublicController::class, 'chooseWebsiteTemplate']);
         // 自助建站-5.保存到草稿箱
         Router::post('/saveWebsiteTemplate', [PublicController::class, 'saveWebsiteTemplate']);
+        // 自助建站-6.返显保存的模版
+        Router::post('/getWebsiteTemplate', [PublicController::class, 'getWebsiteTemplate']);
 
         
         // 企业管理

config/api/web.php

@@ -105,6 +105,15 @@ Router::addGroup(
                 Router::get('/getWebsiteTsbbDetail', [WebController::class, 'getWebsiteTsbbDetail']);
                 //农网导航
                 Router::get('/getWebsiteNwHomeList', [WebController::class, 'getWebsiteNwHomeList']);
+
+                // c端  
+                // 企业模块
+                Router::get('/getWebsiteCompany', [WebController::class, 'getWebsiteCompany']);
+                // 企业列表
+                Router::get('/getWebsiteCompanyList', [WebController::class, 'getWebsiteCompanyList']);
+                // 企业详情
+                Router::get('/getWebsiteCompanyInfo', [WebController::class, 'getWebsiteCompanyInfo']);
+                
                 
             },
     ['middleware' => [WebMiddleware::class]]

config/api/website.php

@@ -155,6 +155,8 @@ Router::addGroup(
         Router::post('/upWhiteRouter', [WebsiteController::class, 'upWhiteRouter']);
         // 克隆网站
         Router::post('/cloneWebsite', [WebsiteController::class, 'cloneWebsite']);
+        //更新网站状态
+        Router::post('/updateWebsiteStatus', [WebsiteController::class, 'updateWebsiteStatus']);
 
         // --网站路由白名单-----------fr----------------------end
     },