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

app/Controller/NewsController.php

@@ -1251,8 +1251,8 @@ class NewsController extends AbstractController
     *后端-招聘 新增职位
     * @return array
     */
-    public function addJobRecruiting()
-    {
+    public function addJobRecruiting(){
+        var_dump('111------********************----controller');
         $requireData = $this->request->all();
         // 定义验证规则数组
         $jobValidationRules = [
@@ -1318,7 +1318,7 @@ class NewsController extends AbstractController
         if (!isset($requireData['user_type']) || $requireData['user_type'] === null) {
             return Result::error('参数错误');
         }
-
+        var_dump('111------**********初步验证**********----controller');
         switch ($requireData['user_type']) {
             case 3:
                 $validator = $this->validationFactory->make($requireData, $jobValidationRules, $jobValidationMessages);
@@ -1341,7 +1341,9 @@ class NewsController extends AbstractController
             default:
                 return Result::error('不支持的用户类型');
         }
+        var_dump('111------**********最终验证**********----controller');
         $requireData['user_id'] = Context::get("UserId") ?? 0;
+        var_dump('111------********************----controller',$requireData['user_id']);
         $result = $this->newsServiceClient->addJobRecruiting($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }

app/Controller/PublicController.php

@@ -2541,7 +2541,35 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->getSectorType($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
-    
+    /**
+     * 自助建站-获取组件类型
+     * @return array
+     */
+    public function randomWebTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required|int',
+                'template_id' => 'required|int',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'website_id.int' => '网站id必须为整数',
+                'template_id.required' => '模板id不能为空',
+                'template_id.int' => '模板id必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->randomWebTemplate($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+
 
     
      

app/Controller/WebController.php

@@ -259,7 +259,8 @@ class WebController extends AbstractController
             'pid' => $requireData['pid'],
             'placeid' => $requireData['placeid'],
             'num' => $requireData['num'],
-            'type' => $requireData['type'] ?? null
+            'type' => $requireData['type'] ?? null,
+            'is_show' => $requireData['is_show'] ?? null,
         ];    
         $result=$this->websiteServiceClient->getWebsiteModelCategory($data);
         
@@ -1564,6 +1565,41 @@ class WebController extends AbstractController
         $result = $this->newsServiceClient->getWebsiteCategoryJob($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
-
+    /**
+     * 自助建站-流程管理-获取导航栏
+     */
+    public function getWebCategoryList()
+    {
+        $requireData = $this->request->all();     
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'placeid' => 'required',
+                'pid' => 'required',
+                'num' => 'required',
+                'website_id' => 'required'
+            ],
+            [
+                'placeid.required' => '栏目位置不能为空',
+                'pid' => '父级栏目id不能为空',
+                'num' => '栏目数量不能为空',
+                'website_id' => '网站id不能为空'
+            ]
+        );
+        
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'website_id'=>$requireData['website_id'],
+            'pid' => $requireData['pid'],
+            'placeid' => $requireData['placeid'],
+            'num' => $requireData['num'],
+            'is_show' => $requireData['is_show']
+        ];    
+        $result = $this->websiteServiceClient->getWebsiteModelCategory($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 
 }

app/JsonRpc/PublicRpcService.php

@@ -512,6 +512,13 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 自助建站-随机获取模板
+     */
+    public function randomWebTemplate(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 
 
 

app/JsonRpc/PublicRpcServiceInterface.php

@@ -245,6 +245,8 @@ interface PublicRpcServiceInterface
     public function updateComponentImg(array $data);
     //自助建站-获取通栏类型
     public function getSectorType(array $data);
+    //自助建站-随机获取模板
+    public function randomWebTemplate(array $data);
 
 
 

config/api/public.php

@@ -143,6 +143,8 @@ Router::addGroup(
 
         // 获取所有通栏分类
         Router::post('/getSectorType', [PublicController::class, 'getSectorType']);
+        // 随机模板
+        Router::post('/randomWebTemplate', [PublicController::class, 'randomWebTemplate']);
 
     },
     ['middleware' => [FooMiddleware::class]]

config/api/web.php

@@ -138,6 +138,9 @@ Router::addGroup(
         Router::post('/getWebsiteJobResume', [WebController::class, 'getWebsiteJobResume']);
          // 企业会员-我的职位
          Router::post('/getWebsiteJobRecruiting', [WebController::class, 'getWebsiteJobRecruiting']);
+                //自助建站-流程管理-获取导航栏
+        Router::post('/getWebCategoryList', [WebController::class, 'getWebCategoryList']);
+        
     },
     ['middleware' => [FooMiddleware::class]]
 );